diff --git a/pulseaudio.changes b/pulseaudio.changes index 4cac70d..3e1668c 100644 --- a/pulseaudio.changes +++ b/pulseaudio.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 2 17:43:26 CEST 2020 - tiwai@suse.de + +- Control systemd user socket activation in setup-pulseaudio script + too (boo#1168393) + ------------------------------------------------------------------- Wed Feb 12 22:01:05 CET 2020 - tiwai@suse.de diff --git a/setup-pulseaudio b/setup-pulseaudio index 052b500..0edd4b2 100644 --- a/setup-pulseaudio +++ b/setup-pulseaudio @@ -217,6 +217,13 @@ enable_autospawn() { fi } +enable_systemd() { + test -f /etc/systemd/user/sockets.target.wants/pulseaudio.socket || return + echo "Enabling systemd user socket..." + systemctl --global unmask pulseaudio.socket + systemctl --global unmask pulseaudio.service +} + disable_alsa() { echo "Disabling PulseAudio for ALSA..." delete_variable ALSA_CONFIG_PATH @@ -328,6 +335,15 @@ disable_autospawn() { killall pulseaudio > /dev/null 2>&1 } +disable_systemd() { + test -f /etc/systemd/user/sockets.target.wants/pulseaudio.socket || return + echo "Disabling systemd user socket..." + systemctl --global mask pulseaudio.socket + systemctl --global mask pulseaudio.service + # kill leftover PA processes + killall pulseaudio > /dev/null 2>&1 +} + enable_all() { enable_alsa enable_libao @@ -345,6 +361,7 @@ enable_all() { enable_gstreamer enable_qemu enable_autospawn + enable_systemd } disable_all() { @@ -364,6 +381,7 @@ disable_all() { disable_gstreamer disable_qemu disable_autospawn + disable_systemd } case $1 in