This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/openbox-stretch in repository live-build-x2go. from f6ae56c Merge branch 'feature/openbox' into feature/openbox-stretch adds 6cb8ed1 added debug/log code as the secret key file copying doesn't seem to work on Debian stretch adds 58cc432 added code so secret key file copying should also work for MATE-MiniDesktop adds a429b1e Merge branch 'feature/openbox' into feature/openbox-stretch adds 6d130c0 targetusername contents were swapped adds d7dc93c fied comment to match code adds d2b51c8 added more debug code as stretch still doesn't mount/copy the secret key files, even though the blockdevs list is not empty adds db09707 Merge branch 'feature/openbox' into feature/openbox-stretch adds 8f3f99d added further debug output adds 0f4c43c Merge branch 'feature/openbox' into feature/openbox-stretch adds 012d885 typofix adds cd682d9 2260-getsshhostkeysfrommedia now writes list of detected disk labels into its "I'm done" file; 2270-getsshclientkeysfrommedia picks up this list instead of querying anew, also, 2270-getsshclientkeysfrommedia no longer nudges automounter adds 4cc1a51 added debug output of blockdevloopcount adds b9ab065 Merge branch 'feature/openbox' into feature/openbox-stretch adds c8a8bb0 removed debug output adds 5dd1288 Merge branch 'feature/openbox' into feature/openbox-stretch adds f7c6279 (hopefully) fixed issue that parameters without an equals sign became appended to the preceding parameter's value (not fixed in 2900* yet, as those differ across branches) adds 47b593c Merge branch 'feature/openbox' into feature/openbox-stretch adds bceafa5 (hopefully) fixed issue that parameters without an equals sign became appended to the preceding parameter's value adds 2e6f759 Merge branch 'feature/openbox' into feature/openbox-stretch adds b4fe579 typofix adds f3863e5 Merge branch 'feature/openbox' into feature/openbox-stretch adds 9c75c88 added code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) adds df3cf24 Merge branch 'feature/openbox' into feature/openbox-stretch adds 050ccf2 improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) adds aaaceec Merge branch 'feature/openbox' into feature/openbox-stretch adds 5258aff improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) - second attempt adds 7a30878 Merge branch 'feature/openbox' into feature/openbox-stretch adds c7abe5d Revert "improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) - second attempt" adds 9fb4cf9 Revert "improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) - second attempt" adds 79a9708 improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) - second attempt adds 60885b3 improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) - second attempt Merge branch 'feature/openbox' into feature/openbox-stretch adds b68cac2 improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) - third attempt plus typofix adds 0d3be54 Merge branch 'feature/openbox' into feature/openbox-stretch adds fdbc68f improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) - fourth attempt - using a minres with same hsync/vsync polarity adds e78d6f7 Merge branch 'feature/openbox' into feature/openbox-stretch adds 728c200 improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) - fifth attempt adds 2c524c0 Merge branch 'feature/openbox' into feature/openbox-stretch adds 9e25b7d went back to xset dpms force for blankdpmsfix, but now split in two - force suspend at beginning of .xsession, force on at end. Also, rearranged code block for screen saver/dpms on/off, so it doesn't interfere with our hack. adds 0c25eaf Merge branch 'feature/openbox' into feature/openbox-stretch adds fa886d5 added support for ntp= boot parameter, to allow the use of non-debian ntp servers adds cbb7b43 Merge branch 'feature/openbox' into feature/openbox-stretch adds aa38ff0 passing multiple ntp server names/IPs wasn't workung; should work now new 56d6f90 Merge branch 'feature/openbox' into feature/openbox-stretch adds 77de310 fixed missing escape new b69ca29 Merge branch 'feature/openbox' into feature/openbox-stretch new 667a0bb added workaround for NX "magic pixel" being active in --thinclient mode new aff557f changed file name as it didn't contain ".list" and thus seems to have been ignored new f2c3781 workaround wasn't working, swapped out for now-working code new 6d38fb5 fixed missing escape (when will I ever learn ...) new 56de879 Parameter nomagicpixel=1 or nomagicpixel=2 must now be set as kernel boot parameter to enable the magic-pixel-workaround. Also added alternative method to disable magic pixel. Old method is now option 2. new 759c77b once again, fixed missing escapes, le sigh new 0b441dc Changed openbox spawn/terminate conditions: only exactly 3 windows mean that openbox should be terminated. Any less, and we're in "no running session yet" state, any more, and we have a running session, and e.g. a connection loss popup. new 68feac6 added debug option, added further vt8 log output new 56b5fc1 added code so xsession can log to tty8, added 1 second wait in loop to lower cpu usage new 10b2b46 altered debug output - had no write permissions; also, now logs to tty9 as well new 36c2835 added code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) new 8149407 Revert "added code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black)" new 5ebf6f9 Revert "typofix" new 11654c3 typofix new 15fc28f added code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) new 7c17fb8 Revert "typofix" new dcc943d typofix new 6456887 improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) new 01b18be improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) - second attempt new 56dbf0a improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) - third attempt plus typofix new 3098300 improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) - fourth attempt - using a minres with same hsync/vsync polarity new 2d36030 improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) - fifth attempt new 33c2dd8 went back to xset dpms force for blankdpmsfix, but now split in two - force suspend at beginning of .xsession, force on at end. Also, rearranged code block for screen saver/dpms on/off, so it doesn't interfere with our hack. new 4db92a1 cleanup after accidental stretch merge(s) into jessie The 26 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: config/archives/x2go.list.chroot | 2 +- .../includes.chroot/lib/live/config/2000-settime | 20 +++- .../lib/live/config/2100-show-sysconf | 2 +- .../lib/live/config/2250-getsshpubkeysfromserver | 2 +- .../lib/live/config/2260-getsshhostkeysfrommedia | 11 +- .../lib/live/config/2270-getsshclientkeysfrommedia | 38 ++++--- .../lib/live/config/2300-xserver-xorg-getxorgconf | 2 +- .../lib/live/config/2400-live-autoupdate | 12 +- .../includes.chroot/lib/live/config/2600-tcpprint | 2 +- .../lib/live/config/2700-x2go-getsessions | 2 +- .../lib/live/config/2710-x2go-getbranding | 2 +- .../lib/live/config/2720-x2go-getbg | 2 +- .../lib/live/config/2900-x2go-thinclientconfig | 124 ++++++++++++++++----- config/package-lists/firmware.list.chroot | 2 +- config/package-lists/live.list.chroot | 1 + .../magic-pixel-workaround.list.chroot | 3 + config/package-lists/ntfs.list.chroot | 2 +- config/package-lists/x2go.list.chroot | 3 +- 18 files changed, 169 insertions(+), 63 deletions(-) create mode 100644 config/package-lists/magic-pixel-workaround.list.chroot -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit 667a0bb52050d6ed652cdb1ee07a25cd700ccf76 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Sat Nov 4 23:54:15 2017 +0100 added workaround for NX "magic pixel" being active in --thinclient mode --- config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 5 +++++ config/package-lists/magic-pixel-workaround.chroot | 3 +++ 2 files changed, 8 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index d5adaf7..522913e 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -232,6 +232,11 @@ if [ -n "\$BLANKINGTIME" ]; then fi fi +# workaround for NX "magic pixel" being active in --thinclient mode +while true ; do + ps -C xdotool >/dev/null || xdotool search . behave %@ blur windowmap ; +done & + 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 XSESSION diff --git a/config/package-lists/magic-pixel-workaround.chroot b/config/package-lists/magic-pixel-workaround.chroot new file mode 100644 index 0000000..9c0cb9d --- /dev/null +++ b/config/package-lists/magic-pixel-workaround.chroot @@ -0,0 +1,3 @@ +libxdo3 +libxkbcommon0 +xdotool -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit 6d38fb5844ff238833967749dbc3ed7579d77df5 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Sun Nov 5 19:11:35 2017 +0100 fixed missing escape (when will I ever learn ...) --- config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 2 +- 1 file changed, 1 insertion(+), 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 3a11727..8c0f468 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -234,7 +234,7 @@ fi # workaround for NX "magic pixel" being active in --thinclient mode while ! ps -C xdotool >/dev/null ; do - while [ $(xdotool search --name . | wc -l) -lt 3 ] ; do + while [ \$(xdotool search --name . | wc -l) -lt 3 ] ; do sleep 1 done ; xdotool search . behave %@ blur windowmap -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit 56de879ed634b6e4a06c58b347df05d7d25d641d Author: Stefan Baur <kontakt@baur-itcs.de> Date: Mon Nov 13 21:54:48 2017 +0100 Parameter nomagicpixel=1 or nomagicpixel=2 must now be set as kernel boot parameter to enable the magic-pixel-workaround. Also added alternative method to disable magic pixel. Old method is now option 2. --- .../lib/live/config/2900-x2go-thinclientconfig | 25 ++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index 8c0f468..d2aeb1a 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -233,12 +233,25 @@ if [ -n "\$BLANKINGTIME" ]; then fi # workaround for NX "magic pixel" being active in --thinclient mode -while ! ps -C xdotool >/dev/null ; do - while [ \$(xdotool search --name . | wc -l) -lt 3 ] ; do - sleep 1 - done ; - xdotool search . behave %@ blur windowmap -done & +if grep 'nomagicpixel=2' /proc/cmdline ; then + while ! ps -C xdotool >/dev/null ; do + while [ \$(xdotool search --name . | wc -l) -lt 3 ] ; do + sleep 1 + done ; + xdotool search . behave %@ blur windowmap + done & +elif grep 'nomagicpixel=1' /proc/cmdline ; then + while true ; do + while [ $(xdotool search --name . | wc -l) -lt 3 ] && ! ps -C openbox >/dev/null ; do + openbox & + done + while [ $(xdotool search --name . | wc -l) -gt 2 ] && ps -C openbox >/dev/null ; do + killall openbox + done + 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 XSESSION -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit 759c77b24b32bc7c906e48e099de19846bf56695 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Tue Nov 14 02:11:20 2017 +0100 once again, fixed missing escapes, le sigh --- config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index d2aeb1a..82a9b16 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -242,10 +242,10 @@ if grep 'nomagicpixel=2' /proc/cmdline ; then done & elif grep 'nomagicpixel=1' /proc/cmdline ; then while true ; do - while [ $(xdotool search --name . | wc -l) -lt 3 ] && ! ps -C openbox >/dev/null ; do + while [ \$(xdotool search --name . | wc -l) -lt 3 ] && ! ps -C openbox >/dev/null ; do openbox & done - while [ $(xdotool search --name . | wc -l) -gt 2 ] && ps -C openbox >/dev/null ; do + while [ \$(xdotool search --name . | wc -l) -gt 2 ] && ps -C openbox >/dev/null ; do killall openbox done done & -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit f2c3781a2dcf723ccc74054c2fa175bd5a9b8594 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Sun Nov 5 16:25:55 2017 +0100 workaround wasn't working, swapped out for now-working code --- config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index 522913e..3a11727 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -233,8 +233,11 @@ if [ -n "\$BLANKINGTIME" ]; then fi # workaround for NX "magic pixel" being active in --thinclient mode -while true ; do - ps -C xdotool >/dev/null || xdotool search . behave %@ blur windowmap ; +while ! ps -C xdotool >/dev/null ; do + while [ $(xdotool search --name . | wc -l) -lt 3 ] ; do + sleep 1 + done ; + xdotool search . behave %@ blur windowmap done & 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 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit aff557f08f7e9b2245adeb1dda65d9af84ac589c Author: Stefan Baur <kontakt@baur-itcs.de> Date: Sun Nov 5 12:27:29 2017 +0100 changed file name as it didn't contain ".list" and thus seems to have been ignored --- .../{magic-pixel-workaround.chroot => magic-pixel-workaround.list.chroot} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/config/package-lists/magic-pixel-workaround.chroot b/config/package-lists/magic-pixel-workaround.list.chroot similarity index 100% rename from config/package-lists/magic-pixel-workaround.chroot rename to config/package-lists/magic-pixel-workaround.list.chroot -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit b69ca29f714ab3de79790e567173f8a4c5811736 Merge: 56d6f90 77de310 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Wed Jan 24 16:04:36 2018 +0100 Merge branch 'feature/openbox' into feature/openbox-stretch config/includes.chroot/lib/live/config/2000-settime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit 56d6f9079c22064e4d37fd10d9392d6ee9692ab4 Merge: cbb7b43 aa38ff0 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Wed Jan 24 14:43:10 2018 +0100 Merge branch 'feature/openbox' into feature/openbox-stretch config/includes.chroot/lib/live/config/2000-settime | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit dcc943dd673c543ea7b18193ee7e0bbe0ea222da Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 15 02:55:20 2018 +0100 typofix --- config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 2 +- 1 file changed, 1 insertion(+), 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 11f0ec9..8b0da8e 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -236,7 +236,7 @@ if [ -n "\$BLANKINGTIME" ]; then if [ \${DPMSARR[0]} -eq 0 ]; then # Disable screensaver and DPMS Power Saving if requested xset s off - if ! grep -q '\W*nodpms\W*' /proc/cmdline; then + if grep -q '\W*nodpms\W*' /proc/cmdline; then xset -dpms fi else -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit 01b18be5000f78b6258a1903f5395e4e62f94b42 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jan 16 02:49:52 2018 +0100 improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) - second attempt --- .../lib/live/config/2900-x2go-thinclientconfig | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index dc04f15..aa95cf0 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -102,24 +102,10 @@ openbox & echo -en "\n\$(date +'%F | %T | ')'\$0' spawned OpenBox." | tee -a /dev/tty8 # code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) -# it seems that a simple -# xset dpms force standby ; xset dpms force on -# isn't enough (doesn't always help), -# so let's add some resiliency and logging - if grep -q '\W*blankdpmsfix\W*' /proc/cmdline; then - while xset q | grep -q "Monitor is On" ; do - while ! xset q | grep -q "Monitor is in Standby" ; do - echo -en "\n\$(date +'%F | %T | ')'\$0' Attempting to force TFT into 'standby'." | tee -a /dev/tty8 - xset dpms force standby - echo -en "\n\$(date +'%F | %T | ')'\$0' \$(xset q | grep "Monitor is")" | tee -a /dev/tty8 - done - done - while ! xset q | grep -q "Monitor is On" ; do - echo -en "\n\$(date +'%F | %T | ')'\$0' Attempting to force TFT to 'on'." | tee -a /dev/tty8 - xset dpms force on - echo -en "\n\$(date +'%F | %T | ')'\$0' \$(xset q | grep "Monitor is")" | tee -a /dev/tty8 - done + CURRENTRES=\$(xrandr | awk '$0 ~/\*/ { print \$1}') # determine current resolution + xrandr -s 640x480 # set low resolution to trigger TFT wakeup + xrandr -s \$CURRENTRES # restore original resolution fi # set screen background to X2Go default blue on all detected screens -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit 3098300758cf02d1316e0da64e1bf1acdf9853bc Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jan 16 11:46:27 2018 +0100 improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) - fourth attempt - using a minres with same hsync/vsync polarity --- config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 2 +- 1 file changed, 1 insertion(+), 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 5286d03..50aa813 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -104,7 +104,7 @@ echo -en "\n\$(date +'%F | %T | ')'\$0' spawned OpenBox." | tee -a /dev/tty8 # code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) if grep -q '\W*blankdpmsfix\W*' /proc/cmdline; then CURRENTRES=\$(xrandr | awk '\$0 ~/\*/ { print \$1}') # determine current resolution - xrandr -s 640x480 # set low resolution to trigger TFT wakeup + xrandr -s 800x600 # set low resolution to trigger TFT wakeup while ! [ "\$(xrandr | awk '\$0 ~/\*/ { print \$1}')" = "\$CURRENTRES" ] ; do xrandr -s \$CURRENTRES # restore original resolution done -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit 2d36030a1e693931dd0b9ecc5f4e12cd96258ae6 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Wed Jan 17 06:37:01 2018 +0100 improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) - fifth attempt --- .../lib/live/config/2900-x2go-thinclientconfig | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index 50aa813..e7af115 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -37,6 +37,14 @@ cat >/home/user/.xsession <<XSESSION # Spawn PulseAudio pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' --exit-idle-time=65535 & +# code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) +if grep -q '\W*blankdpmsfix\W*' /proc/cmdline; then + for DISPLAYNAME in \$(xrandr | awk '\$2 == "connected" { print \$1 }') ; do + xrandr --output \$DISPLAYNAME --off + xrandr --output \$DISPLAYNAME --auto + done +fi + # additional variable instead of "case \$(...) in", as we need the value again later on XRANDRCMDTAINTED=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F '=' '\$1 == "xinerama" { print \$2 }') @@ -101,15 +109,6 @@ fi openbox & echo -en "\n\$(date +'%F | %T | ')'\$0' spawned OpenBox." | tee -a /dev/tty8 -# code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) -if grep -q '\W*blankdpmsfix\W*' /proc/cmdline; then - CURRENTRES=\$(xrandr | awk '\$0 ~/\*/ { print \$1}') # determine current resolution - xrandr -s 800x600 # set low resolution to trigger TFT wakeup - while ! [ "\$(xrandr | awk '\$0 ~/\*/ { print \$1}')" = "\$CURRENTRES" ] ; do - xrandr -s \$CURRENTRES # restore original resolution - done -fi - # set screen background to X2Go default blue on all detected screens xsetroot -solid "#246ed8" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit 33c2dd8c49b978188ec18599005a9660d20094bb Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Fri Jan 19 14:34:13 2018 +0100 went back to xset dpms force for blankdpmsfix, but now split in two - force suspend at beginning of .xsession, force on at end. Also, rearranged code block for screen saver/dpms on/off, so it doesn't interfere with our hack. --- .../lib/live/config/2900-x2go-thinclientconfig | 32 ++++++++++++++++------ 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index e7af115..e81267e 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -37,14 +37,6 @@ cat >/home/user/.xsession <<XSESSION # Spawn PulseAudio pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' --exit-idle-time=65535 & -# code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) -if grep -q '\W*blankdpmsfix\W*' /proc/cmdline; then - for DISPLAYNAME in \$(xrandr | awk '\$2 == "connected" { print \$1 }') ; do - xrandr --output \$DISPLAYNAME --off - xrandr --output \$DISPLAYNAME --auto - done -fi - # additional variable instead of "case \$(...) in", as we need the value again later on XRANDRCMDTAINTED=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F '=' '\$1 == "xinerama" { print \$2 }') @@ -277,6 +269,30 @@ else : # NOP fi +# code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) +if grep -q '\W*blankdpmsfix\W*' /proc/cmdline; then + xset dpms force on dpms 0 0 0 -dpms +fi + +BLANKINGTIME=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F '=' '\$1 == "blank" { print \$2 }' | tr -dc '0-9:') +if [ -n "\$BLANKINGTIME" ]; then + DPMSARR=(\$(echo \$BLANKINGTIME | awk -F ':' '\$1 ~/^[0-9]*\$/ && \$2 ~/^[0-9]*\$/ && \$3 ~/^[0-9]*\$/ { print \$1 " " \$2 " " \$3}')) + if [ \${DPMSARR[0]} -eq 0 ]; then + # Disable screensaver and DPMS Power Saving if requested + xset s off + if grep -q '\W*nodpms\W*' /proc/cmdline; then + xset -dpms + fi + else + xset s on + xset s \${DPMSARR[0]} + if ! grep -q '\W*nodpms\W*' /proc/cmdline; then + # Yes, "+dpms dpms" is intentional. + xset +dpms dpms \${DPMSARR[0]} \${DPMSARR[1]} \${DPMSARR[2]} + fi + fi +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 # yes, no escape sign in front of DEBUGPARAMS, that is intentional XSESSION -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit 0b441dc61b3694978bc194f0184f27b0a2f084e5 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Tue Nov 14 09:02:57 2017 +0100 Changed openbox spawn/terminate conditions: only exactly 3 windows mean that openbox should be terminated. Any less, and we're in "no running session yet" state, any more, and we have a running session, and e.g. a connection loss popup. --- config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index 82a9b16..89c1cb8 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -242,10 +242,10 @@ if grep 'nomagicpixel=2' /proc/cmdline ; then done & elif grep 'nomagicpixel=1' /proc/cmdline ; then while true ; do - while [ \$(xdotool search --name . | wc -l) -lt 3 ] && ! ps -C openbox >/dev/null ; do + while [ \$(xdotool search --name . | wc -l) -ne 3 ] && ! ps -C openbox >/dev/null ; do openbox & done - while [ \$(xdotool search --name . | wc -l) -gt 2 ] && ps -C openbox >/dev/null ; do + while [ \$(xdotool search --name . | wc -l) -eq 3 ] && ps -C openbox >/dev/null ; do killall openbox done done & -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit 68feac6d3e764957248f64d583b59d337934f9c8 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 89c1cb8..be4caae 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -89,6 +89,7 @@ fi # 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" @@ -141,6 +142,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 @@ -238,22 +242,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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit 10b2b4637abbc15c552624c145c69f66fc82c812 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 107aa48..2e1e6ba 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... @@ -145,9 +152,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 @@ -265,7 +269,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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit 81494070e8cc0c5c134996ad500bfc43c7e3def2 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 15 02:47:28 2018 +0100 Revert "added code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black)" This reverts commit 9a32721fa8d56335da6028ec471a48afdedbda73. --- config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index d851f93..2e1e6ba 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -101,11 +101,6 @@ fi openbox & echo -en "\n\$(date +'%F | %T | ')'\$0' spawned OpenBox." | tee -a /dev/tty8 -if grep -q '\W*blankdpmsfix\W*' /proc/cmdline; then - xset dpms force standby - xset dpms force on -fi - # set screen background to X2Go default blue on all detected screens xsetroot -solid "#246ed8" @@ -236,7 +231,7 @@ if [ -n "\$BLANKINGTIME" ]; then # Disable screensaver and DPMS Power Saving if requested xset s off if grep -q '\W*nodpms\W*' /proc/cmdline; then - xset dpms 0 0 0 # lasts over force commands, unlike -dpms + xset -dpms fi else xset s on -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit 11654c369e24e861d317ae5568a42bfbec52a72b Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 15 02:53:11 2018 +0100 typofix --- config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 2 +- 1 file changed, 1 insertion(+), 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 2842035..2e1e6ba 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -230,7 +230,7 @@ if [ -n "\$BLANKINGTIME" ]; then if [ \${DPMSARR[0]} -eq 0 ]; then # Disable screensaver and DPMS Power Saving if requested xset s off - if ! grep -q '\W*nodpms\W*' /proc/cmdline; then + if grep -q '\W*nodpms\W*' /proc/cmdline; then xset -dpms fi else -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit 5ebf6f9ec9b74aa043992dbdeb64df514ed5b5f6 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 15 02:51:41 2018 +0100 Revert "typofix" This reverts commit b4fe579bff4ca591042541b19a311fb52a8d90ab. --- config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 2 +- 1 file changed, 1 insertion(+), 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 2e1e6ba..2842035 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -230,7 +230,7 @@ if [ -n "\$BLANKINGTIME" ]; then if [ \${DPMSARR[0]} -eq 0 ]; then # Disable screensaver and DPMS Power Saving if requested xset s off - if grep -q '\W*nodpms\W*' /proc/cmdline; then + if ! grep -q '\W*nodpms\W*' /proc/cmdline; then xset -dpms fi else -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit 56dbf0a844c6dba8d58ef15cabb60592f40aa3bc Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jan 16 07:53:26 2018 +0100 improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) - third attempt plus typofix --- config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index aa95cf0..5286d03 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -103,9 +103,11 @@ echo -en "\n\$(date +'%F | %T | ')'\$0' spawned OpenBox." | tee -a /dev/tty8 # code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) if grep -q '\W*blankdpmsfix\W*' /proc/cmdline; then - CURRENTRES=\$(xrandr | awk '$0 ~/\*/ { print \$1}') # determine current resolution + CURRENTRES=\$(xrandr | awk '\$0 ~/\*/ { print \$1}') # determine current resolution xrandr -s 640x480 # set low resolution to trigger TFT wakeup - xrandr -s \$CURRENTRES # restore original resolution + while ! [ "\$(xrandr | awk '\$0 ~/\*/ { print \$1}')" = "\$CURRENTRES" ] ; do + xrandr -s \$CURRENTRES # restore original resolution + done fi # set screen background to X2Go default blue on all detected screens -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit 15fc28f6f8b1ebb07dc62450093c6f69576d4f7d Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 15 02:53:52 2018 +0100 added code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) --- config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index 2e1e6ba..8b0da8e 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -101,6 +101,12 @@ fi openbox & echo -en "\n\$(date +'%F | %T | ')'\$0' spawned OpenBox." | tee -a /dev/tty8 +# code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) +if grep -q '\W*blankdpmsfix\W*' /proc/cmdline; then + xset dpms force standby + xset dpms force on +fi + # set screen background to X2Go default blue on all detected screens xsetroot -solid "#246ed8" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit 36c28353a4abcd05e87da7a33f1028c2344ccdfd Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 15 02:44:12 2018 +0100 added code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) --- config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 7 ++++++- 1 file changed, 6 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 2e1e6ba..d851f93 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -101,6 +101,11 @@ fi openbox & echo -en "\n\$(date +'%F | %T | ')'\$0' spawned OpenBox." | tee -a /dev/tty8 +if grep -q '\W*blankdpmsfix\W*' /proc/cmdline; then + xset dpms force standby + xset dpms force on +fi + # set screen background to X2Go default blue on all detected screens xsetroot -solid "#246ed8" @@ -231,7 +236,7 @@ if [ -n "\$BLANKINGTIME" ]; then # Disable screensaver and DPMS Power Saving if requested xset s off if grep -q '\W*nodpms\W*' /proc/cmdline; then - xset -dpms + xset dpms 0 0 0 # lasts over force commands, unlike -dpms fi else xset s on -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit 56b5fc10de1ddf43b15fc1556c39a52c99777717 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Thu Dec 7 00:34:46 2017 +0100 added code so xsession can log to tty8, added 1 second wait in loop to lower cpu usage --- .../lib/live/config/2900-x2go-thinclientconfig | 39 ++++++++++++---------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index be4caae..107aa48 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -19,6 +19,9 @@ sed -i -e '\#<applications>#a<application title="X2Go Client" type="normal">' -e #make sure OpenBox' ToggleMaximize is disabled, or else clicking the top row of pixels will un-maximize X2GoClient sed -i -e '/ToggleMaximize/d' /etc/xdg/openbox/rc.xml +# this is so that xsession can log to tty8 +adduser user tty + cat >/home/user/.xsession <<XSESSION # inspired by # http://code.x2go.org/gitweb?p=x2gothinclient.git;a=blob_plain;f=displaymanag... @@ -89,7 +92,7 @@ fi # Spawn openbox openbox & -echo -n "\n\$(date +'%F | %T | ')'\$0' spawned OpenBox." +echo -en "\n\$(date +'%F | %T | ')'\$0' spawned OpenBox." | tee -a /dev/tty8 # set screen background to X2Go default blue on all detected screens xsetroot -solid "#246ed8" @@ -239,25 +242,25 @@ fi # workaround for NX "magic pixel" being active in --thinclient mode if grep 'nomagicpixel=2' /proc/cmdline ; then while ! ps -C xdotool >/dev/null ; do - 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 + while [ \$(xdotool search --name . | wc -l) -lt 3 ] ; do + sleep 1 + done ; + echo -en "\n\$(date +'%F | %T | ')'\$0' spawning window foreground monitor (magic-pixel-fix 2)." | tee -a /dev/tty8 + 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 & + echo -en "\n\$(date +'%F | %T | ')'\$0' spawning openbox monitor (magic-pixel-fix 1)." | tee -a /dev/tty8 + while true ; do + while [ \$(xdotool search --name . | wc -l) -ne 3 ] && ! ps -C openbox >/dev/null ; do + openbox & + echo -en "\n\$(date +'%F | %T | ')'\$0' spawned OpenBox." | tee -a /dev/tty8 + done + while [ \$(xdotool search --name . | wc -l) -eq 3 ] && ps -C openbox >/dev/null ; do + killall openbox + echo -en "\n\$(date +'%F | %T | ')'\$0' killed OpenBox." | tee -a /dev/tty8 + done + sleep 1 # to save cpu cycles + done & else : # NOP fi -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit 7c17fb83bdee048d00c7768ac63bf69636315b47 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 15 02:54:57 2018 +0100 Revert "typofix" This reverts commit b4fe579bff4ca591042541b19a311fb52a8d90ab. --- config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 2 +- 1 file changed, 1 insertion(+), 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 8b0da8e..11f0ec9 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -236,7 +236,7 @@ if [ -n "\$BLANKINGTIME" ]; then if [ \${DPMSARR[0]} -eq 0 ]; then # Disable screensaver and DPMS Power Saving if requested xset s off - if grep -q '\W*nodpms\W*' /proc/cmdline; then + if ! grep -q '\W*nodpms\W*' /proc/cmdline; then xset -dpms fi else -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit 6456887315ce58a91b3feb6b1362aebc731639c6 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 15 06:09:01 2018 +0100 improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) --- .../lib/live/config/2900-x2go-thinclientconfig | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index 8b0da8e..dc04f15 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -102,9 +102,24 @@ openbox & echo -en "\n\$(date +'%F | %T | ')'\$0' spawned OpenBox." | tee -a /dev/tty8 # code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) +# it seems that a simple +# xset dpms force standby ; xset dpms force on +# isn't enough (doesn't always help), +# so let's add some resiliency and logging + if grep -q '\W*blankdpmsfix\W*' /proc/cmdline; then - xset dpms force standby - xset dpms force on + while xset q | grep -q "Monitor is On" ; do + while ! xset q | grep -q "Monitor is in Standby" ; do + echo -en "\n\$(date +'%F | %T | ')'\$0' Attempting to force TFT into 'standby'." | tee -a /dev/tty8 + xset dpms force standby + echo -en "\n\$(date +'%F | %T | ')'\$0' \$(xset q | grep "Monitor is")" | tee -a /dev/tty8 + done + done + while ! xset q | grep -q "Monitor is On" ; do + echo -en "\n\$(date +'%F | %T | ')'\$0' Attempting to force TFT to 'on'." | tee -a /dev/tty8 + xset dpms force on + echo -en "\n\$(date +'%F | %T | ')'\$0' \$(xset q | grep "Monitor is")" | tee -a /dev/tty8 + done fi # set screen background to X2Go default blue on all detected screens -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-stretch in repository live-build-x2go. commit 4db92a1f841f1c1a5df5bc2c906fbcd09832c079 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Wed Jan 24 10:30:29 2018 +0100 cleanup after accidental stretch merge(s) into jessie --- config/archives/x2go.list.chroot | 2 +- config/package-lists/firmware.list.chroot | 2 +- config/package-lists/live.list.chroot | 1 + config/package-lists/ntfs.list.chroot | 2 +- config/package-lists/x2go.list.chroot | 3 ++- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config/archives/x2go.list.chroot b/config/archives/x2go.list.chroot index 033eeea..51c0819 100644 --- a/config/archives/x2go.list.chroot +++ b/config/archives/x2go.list.chroot @@ -1 +1 @@ -deb http://packages.x2go.org/debian stretch main +deb http://packages.x2go.org/debian jessie main diff --git a/config/package-lists/firmware.list.chroot b/config/package-lists/firmware.list.chroot index 103bd36..603f805 100644 --- a/config/package-lists/firmware.list.chroot +++ b/config/package-lists/firmware.list.chroot @@ -1,7 +1,7 @@ firmware-linux-free firmware-linux-nonfree firmware-linux -firmware-misc-nonfree firmware-realtek +firmware-ralink firmware-atheros firmware-iwlwifi diff --git a/config/package-lists/live.list.chroot b/config/package-lists/live.list.chroot index 2e7d164..5972111 100644 --- a/config/package-lists/live.list.chroot +++ b/config/package-lists/live.list.chroot @@ -2,6 +2,7 @@ cifs-utils console-setup console-setup-linux fuse +httpfs2 initramfs-tools kbd keyboard-configuration diff --git a/config/package-lists/ntfs.list.chroot b/config/package-lists/ntfs.list.chroot index da18f0e..e3e6fd6 100644 --- a/config/package-lists/ntfs.list.chroot +++ b/config/package-lists/ntfs.list.chroot @@ -1,6 +1,6 @@ fuse libfuse2 libgcrypt20 -#libgnutls-deb0-28 +libgnutls-deb0-28 libgpg-error0 ntfs-3g diff --git a/config/package-lists/x2go.list.chroot b/config/package-lists/x2go.list.chroot index 8b91e0d..a692b23 100644 --- a/config/package-lists/x2go.list.chroot +++ b/config/package-lists/x2go.list.chroot @@ -15,7 +15,7 @@ libfreerdp-primitives1.1 libfreerdp-rail1.1 libfreerdp-utils1.1 libjpeg62-turbo -libssl1.0.2 +libssl1.0.0 libwinpr-crt0.1 libwinpr-crypto0.1 libwinpr-dsparse0.1 @@ -46,6 +46,7 @@ libxrender1 libxv1 pinentry-x2go pulseaudio +pulseaudio-module-x11 pulseaudio-utils rdesktop udev -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
-
git-admin＠x2go.org