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 e1d527266bce6ee7f113b63963178d283d4073fa Author: Stefan Baur (BAUR-ITCS) <kontakt@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 --- .../lib/live/config/2800-x2go-thinclientconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index c709426..85f3546 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -20,6 +20,10 @@ 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
+# 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=displaymanag... @@ -27,6 +31,7 @@ cat >/home/user/.xsession <<XSESSION # Spawn PulseAudio <<<<<<< HEAD +<<<<<<< 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 @@ -86,12 +91,16 @@ 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 +======= +pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' --exit-idle-time=65535 & +>>>>>>> f17b900... moved amixer calls to startup script and changed pulseaudio spawn - wouldn't work otherwise, hopefully does now
# Spawn openbox openbox & <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # set screen background to X2Go default blue on all detected screens xsetroot -solid "#246ed8" @@ -144,6 +153,8 @@ amixer -q sset Master 100 amixer -q sset PCM 100
> 2b64e16... moved audio volume presets to xsession - seems to require running PA +======= +>>>>>>> f17b900... moved amixer calls to startup script and changed pulseaudio spawn - wouldn't work otherwise, hopefully does now # 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
-- 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