From a2f3a7bf4d5a4724748b9d8da9533b9102410831 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Fri, 9 Sep 2016 22:09:35 +0200 Subject: [PATCH] launch: Remove the already implicit After=pulseaudio.socket Also clarify the comment as to what can actually happen here. --- src/daemon/systemd/user/pulseaudio.service.in | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/daemon/systemd/user/pulseaudio.service.in b/src/daemon/systemd/user/pulseaudio.service.in index 0d03cc5a6..2bd780f82 100644 --- a/src/daemon/systemd/user/pulseaudio.service.in +++ b/src/daemon/systemd/user/pulseaudio.service.in @@ -1,21 +1,19 @@ [Unit] Description=Sound Service -# We require pulseaudio.socket to be active before starting the daemon, for two -# reasons: +# We require pulseaudio.socket to be active before starting the daemon, because +# while it is possible to use the service without the socket, it is not clear +# why it would be desirable. # -# 1. There are no implicit dependencies between sockets and services, so -# the socket, as set up by systemd will race with the socket, as set up -# by the pulseaudio daemon. This can cause the pulseaudio.socket unit to -# fail (even though the pulseaudio service started just fine), which can -# confuse users. -# 2. While it is possible to use the service without the socket, it is not -# clear why it would be desirable. And a user installing pulseaudio and -# doing `systemctl --user start pulseaudio` will not get the socket -# started, which might be confusing and problematic if the server is to -# be restarted later on, as the client autospawn feature might kick in. +# A user installing pulseaudio and doing `systemctl --user start pulseaudio` +# will not get the socket started, which might be confusing and problematic if +# the server is to be restarted later on, as the client autospawn feature +# might kick in. Also, a start of the socket unit will fail, adding to the +# confusion. +# +# After=pulseaudio.socket is not needed, as it is already implicit in the +# socket-service relationship, see systemd.socket(5). Requires=pulseaudio.socket -After=pulseaudio.socket [Service] # Note that notify will only work if --daemonize=no