[X2Go-Commits] [live-build-x2go] 12/38: moved amixer calls to startup script and changed pulseaudio spawn - wouldn't work otherwise, hopefully does now

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/fvwm
in repository live-build-x2go.

commit 653dc5097ec4bfb2e5fcf9ab82ed3af3be11d71b
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Wed Jun 22 10:55:11 2016 +0200

    moved amixer calls to startup script and changed pulseaudio spawn - wouldn't work otherwise, hopefully does now
---
 .../includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
index 556888f..3ba329c 100755
--- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
@@ -9,21 +9,21 @@ echo -n " x2gothinclientconfig"
 
 sed -i -e '\#<applications>#a<application title="X2Go Client" type="normal">' -e '\#<applications>#a<decor>no</decor>' -e '\#<applications>#a</application>' /etc/xdg/openbox/rc.xml
 
+# Set Audio Volume
+amixer -q sset Master 100
+amixer -q sset PCM 100
+
 cat >/home/user/.xsession <<XSESSION
 # inspired by 
 # http://code.x2go.org/gitweb?p=x2gothinclient.git;a=blob_plain;f=displaymanager/sbin/x2gothinclientd;h=6897d42d17bd6778e7de5e62ec3f51727d4e8800;hb=HEAD
 # check the above file for ideas before reinventing the wheel
 
 # Spawn PulseAudio
-ps -C pulseaudio --no-headers || (su - user -c "pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' --exit-idle-time=65535")&
+pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' --exit-idle-time=65535 &
 
 # Spawn openbox
 openbox &
 
-# Set Audio Volume
-amixer -q sset Master 100
-amixer -q sset PCM 100
-
 # Spawn X2GoClient
 x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --session-conf=/etc/x2go/x2gothinclient_sessions
 XSESSION

--
Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git