diff options
author | Wim Taymans <wtaymans@redhat.com> | 2016-03-28 18:14:11 +0200 |
---|---|---|
committer | Wim Taymans <wtaymans@redhat.com> | 2016-03-28 18:14:11 +0200 |
commit | edeb7753406f84046eca02df4690c39cafca6b63 (patch) | |
tree | a52ac065c2c91a80b307445b3ff5bcc3decd1902 | |
parent | 18800da650c0014f44a58c18113dff6f5368e6cc (diff) |
autostart: handle case were autospawn is disabledrhel-7.2
handle case were autospawn is disabled (or otherwise doesn't work, like for
root user)
Resolves: #1269104
-rwxr-xr-x | src/daemon/start-pulseaudio-x11.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/daemon/start-pulseaudio-x11.in b/src/daemon/start-pulseaudio-x11.in index 16e46b1ca..15c79e187 100755 --- a/src/daemon/start-pulseaudio-x11.in +++ b/src/daemon/start-pulseaudio-x11.in @@ -17,6 +17,9 @@ set -e +# probe to test if autospawn works, else resort to starting manually +@PACTL_BINARY@ info > /dev/null 2>&1 || @PA_BINARY@ --start "$@" + if [ x"$DISPLAY" != x ] ; then @PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY" > /dev/null |