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 5961474079e11118b9578f1f668188d6a00dcae3 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jun 21 21:41:57 2016 +0200 typofix, and different invocation of pulseaudio --- .../lib/live/config/2800-x2go-thinclientconfig | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 76e254f..2dc79c4 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -5,6 +5,7 @@ X2GoThinClientConfig () # Output startup message # +<<<<<<< HEAD echo -n " x2go-thinclientconfig" # using xmlstarlet would mean wasting yet another Megabyte of space ... @@ -13,6 +14,10 @@ sed -i -e 's#<number>4</number>#<number>1</number>#' /etc/xdg/openbox/rc.xml # disable OpenBox context menu (would be accessible in xinerama) sed -i -e '\#<action name="ShowMenu"><menu>[a-z-]*-menu</menu></action>#d' /etc/xdg/openbox/rc.xml # make sure OpenBox maximizes X2GoClient on launch and hides window decorations +======= +echo -n " x2gothinclientconfig" + +>>>>>>> dd779e0... typofix, and different invocation of pulseaudio 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 cat >/home/user/.xsession <<XSESSION @@ -21,6 +26,7 @@ cat >/home/user/.xsession <<XSESSION # check the above file for ideas before reinventing the wheel # Spawn PulseAudio +<<<<<<< HEAD pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' --exit-idle-time=65535 & # additional variable instead of "case \$(...) in", as we need the value again later on @@ -77,10 +83,14 @@ for NEXT_DISPLAY in \$(LANG=C xrandr 2>/dev/null | grep ' connected ' | cut -d ' THIS_DISPLAY=\$NEXT_DISPLAY fi done +======= +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")& +>>>>>>> dd779e0... typofix, and different invocation of pulseaudio # Spawn openbox openbox & +<<<<<<< HEAD # set screen background to X2Go default blue on all detected screens xsetroot -solid "#246ed8" @@ -126,11 +136,22 @@ if grep -q '\W*noblank\W*' /proc/cmdline; then fi x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt \$LDAPPARAMS \$SESSIONFROM +======= +# Spawn X2GoClient +x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --session-conf=/etc/x2go/x2gothinclient_sessions +>>>>>>> dd779e0... typofix, and different invocation of pulseaudio XSESSION chown user:user /home/user/.xsession chmod 644 /home/user/.xsession +<<<<<<< HEAD +======= +# Set Audio Volume +amixer -q sset Master 100 +amixer -q sset PCM 100 + +>>>>>>> dd779e0... typofix, and different invocation of pulseaudio } X2GoThinClientConfig -- 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