sfos: Prevent user session daemon from starting if system daemon is r…

…unning.

Wait until system daemon pid file disappears before starting user
session PulseAudio.

See JB#49307

rpm/pulseaudio-system.service

@@ -11,6 +11,10 @@ PartOf=emergency-call.target
 [Service]
 EnvironmentFile=-/etc/sysconfig/pulseaudio
 ExecStart=/usr/bin/pulseaudio --daemonize=no --system --disallow-module-loading $CONFIG
+# Make sure pid file is cleaned when stopping system PulseAudio,
+# as user session service will defer startup until the pid file
+# doesn't exist anymore.
+ExecStopPost=/bin/sh -c "rm -f /run/pulse/pid"
 Restart=always
 RestartSec=1
 Type=notify

rpm/pulseaudio.service

@@ -5,6 +5,9 @@ Requires=dbus.socket
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/pulseaudio
+# Wait until system PulseAudio daemon has completely shut down before
+# starting user session daemon.
+ExecStartPre=/bin/sh -c "while [ -f /run/pulse/pid ]; do sleep 1; done"
 ExecStart=/usr/bin/pulseaudio --daemonize=no $CONFIG
 Restart=always
 RestartSec=1