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 dc5fccf56ef8cda6e6ac80be0a29270060bef469 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Dec 6 23:07:27 2017 +0100 added debug option, added further vt8 log output --- .../lib/live/config/2900-x2go-thinclientconfig | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index f2865f3..5bbe0a9 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -84,6 +84,7 @@ done # Spawn openbox openbox & +echo -n "\n\$(date +'%F | %T | ')'\$0' spawned OpenBox." # set screen background to X2Go default blue on all detected screens xsetroot -solid "#246ed8" @@ -136,6 +137,9 @@ 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 @@ -227,22 +231,27 @@ if grep 'nomagicpixel=2' /proc/cmdline ; then while [ \$(xdotool search --name . | wc -l) -lt 3 ] ; do sleep 1 done ; + echo -n "\n\$(date +'%F | %T | ')'\$0' spawning window foreground monitor (magic-pixel-fix 2)." xdotool search . behave %@ blur windowmap done & elif grep 'nomagicpixel=1' /proc/cmdline ; then + echo -n "\n\$(date +'%F | %T | ')'\$0' spawning openbox monitor (magic-pixel-fix 1)." while true ; do while [ \$(xdotool search --name . | wc -l) -ne 3 ] && ! ps -C openbox >/dev/null ; do openbox & + echo -n "\n\$(date +'%F | %T | ')'\$0' spawned OpenBox." done while [ \$(xdotool search --name . | wc -l) -eq 3 ] && ps -C openbox >/dev/null ; do killall openbox + echo -n "\n\$(date +'%F | %T | ')'\$0' killed OpenBox." done + echo -n "\n\$(date +'%F | %T | ')'\$0' reloading openbox monitor (magic-pixel-fix 1)." done & 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 +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 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