This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-magic-pixel-workaround in repository live-build-x2go. commit 41bb79c37f08e512ac4c2d784709be82351de71f Author: Stefan Baur <kontakt@baur-itcs.de> Date: Thu Dec 7 13:17:53 2017 +0100 altered debug output - had no write permissions; also, now logs to tty9 as well --- .../lib/live/config/2900-x2go-thinclientconfig | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index 0279dad..61e3d60 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -22,6 +22,13 @@ sed -i -e '/ToggleMaximize/d' /etc/xdg/openbox/rc.xml # this is so that xsession can log to tty8 adduser user tty +# this is for additional debug logging +if grep -q ' tcedebug' /proc/cmdline; then + touch /var/log/x2goclient + chmod 666 /var/log/x2goclient + DEBUGPARAMS='--debug 2>&1 | tee /var/log/x2goclient >/dev/tty9' +fi + cat >/home/user/.xsession <<XSESSION # inspired by # http://code.x2go.org/gitweb?p=x2gothinclient.git;a=blob_plain;f=displaymanag... @@ -140,9 +147,6 @@ if grep -q ' bg=' /proc/cmdline; then fi # Spawn X2GoClient -if grep -q ' tcedebug' /proc/cmdline; then - DEBUGPARAMS='--debug 2>&1 >/var/log/x2goclient' -fi if [ -n "\$SESSIONSELECT" ]; then STARTSESSION="--session='\$SESSIONSELECT'" fi @@ -254,7 +258,7 @@ else : # NOP fi -eval \$THROTTLINGCOMMAND x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export \$LDAPPARAMS \$SESSIONFROM \$BACKGROUND \$BRANDING \$STARTSESSION \$DEBUGPARAMS +eval \$THROTTLINGCOMMAND x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export \$LDAPPARAMS \$SESSIONFROM \$BACKGROUND \$BRANDING \$STARTSESSION $DEBUGPARAMS # yes, no escape sign in front of DEBUGPARAMS, that is intentional XSESSION chown user:user /home/user/.xsession -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git