This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox in repository live-build-x2go. commit 40168503eca35237701c5a771f0fc4c4070245b0 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Mar 19 08:53:46 2019 +0100 split 60x11-spawn-configure-pulseaudio into 60x11-spawn-pulseaudio and 60x11-configure-pulseaudio (so we can remove 60x11-spawn-pulseaudio from the minidesktop branches, where it conflicts with MATE) --- ...x11-spawn-configure-pulseaudio => 60x11-configure-pulseaudio} | 9 +-------- config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-pulseaudio | 7 +++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-pulseaudio b/config/includes.chroot/etc/X11/Xsession.d/60x11-configure-pulseaudio similarity index 79% rename from config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-pulseaudio rename to config/includes.chroot/etc/X11/Xsession.d/60x11-configure-pulseaudio index 6331469..1a4849d 100644 --- a/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-pulseaudio +++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-configure-pulseaudio @@ -1,11 +1,4 @@ -# Spawn PulseAudio -if ! ps -C pulseaudio >/dev/null && [ -x /usr/bin/pulseaudio ] ; then - pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' --exit-idle-time=65535 & - echo -en "\n$(date +'%F | %T | ')'$0' spawned PulseAudio." | tee -a /dev/tty8 -else - echo -en "\n$(date +'%F | %T | ')'$0' Not spawning Pulseaudio - already running (MiniDesktop active?) or executable not found." | tee -a /dev/tty8 -fi - +# Configure pulseaudio AUDIOOUT=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F'=' ' /^audioout=/ { print $2 }' | tr -dc 'a-zA-Z0-9.:_\-@|') if [ -n "$AUDIOOUT" ] ; then diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-pulseaudio b/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-pulseaudio new file mode 100644 index 0000000..47e9531 --- /dev/null +++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-pulseaudio @@ -0,0 +1,7 @@ +# Spawn PulseAudio +if ! ps -C pulseaudio >/dev/null && [ -x /usr/bin/pulseaudio ] ; then + pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' --exit-idle-time=65535 & + echo -en "\n$(date +'%F | %T | ')'$0' spawned PulseAudio." | tee -a /dev/tty8 +else + echo -en "\n$(date +'%F | %T | ')'$0' Not spawning Pulseaudio - already running (MiniDesktop active?) or executable not found." | tee -a /dev/tty8 +fi -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git