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 b8d2e5384fbfb90cd64496df7d1d531d394a8759 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jun 21 22:11:17 2016 +0200 moved audio volume presets to xsession - seems to require running PA --- .../includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 2dc79c4..c709426 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -91,6 +91,7 @@ ps -C pulseaudio --no-headers || (su - user -c "pulseaudio -D -n -L 'module-nati openbox & <<<<<<< HEAD +<<<<<<< HEAD # set screen background to X2Go default blue on all detected screens xsetroot -solid "#246ed8" @@ -137,6 +138,12 @@ fi x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt \$LDAPPARAMS \$SESSIONFROM ======= +======= +# Set Audio Volume +amixer -q sset Master 100 +amixer -q sset PCM 100 + +>>>>>>> 2b64e16... moved audio volume presets to xsession - seems to require running PA # 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 @@ -146,12 +153,15 @@ chown user:user /home/user/.xsession chmod 644 /home/user/.xsession
<<<<<<< HEAD +<<<<<<< HEAD ======= # Set Audio Volume amixer -q sset Master 100 amixer -q sset PCM 100
> dd779e0... typofix, and different invocation of pulseaudio +======= +>>>>>>> 2b64e16... moved audio volume presets to xsession - seems to require running PA }
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