This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/openbox-magic-pixel-workaround in repository live-build-x2go. discards b494afb 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. discards b50aee6 once again, fixed missing escapes, le sigh discards e7ba87a 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. discards 9c081ab undid commit a45f251bddf68e498dbbcceb638be45c26c4a96e as repo is up again discards 3579ceb temporary x2go archive path change due to server maintenance discards 4a1f3fc fixed missing escape (when will I ever learn ...) discards a25ec3e workaround wasn't working, swapped out for now-working code discards 483eae9 changed file name as it didn't contain ".list" and thus seems to have been ignored discards 7c6088f added workaround for NX "magic pixel" being active in --thinclient mode discards 9abe10d added required dependencies for previously added package discards a62ef3c added libfreerdp-plugins-standard so drive forwarding works with xfreerdp discards dc90ad3 added '@' as allowed character in broker URL, sessionselect, and LDAP parameters discards 8e4c174 added check so key copy routine only runs when "copysecring" boot parameter is set discards 55efbbb added checks so only keyfiles are copied discards 75484b1 wildcards were missing for additional directories discards 5d9d8f8 changed routine to be more like GetSSHHostKeysFromMedia, also, added check so it waits until GetSSHHostKeysFromMedia is done discards 488e70e added check for already-running sshd discards 787b0c6 added "finished" marker discards c11942a separate umount added, for when the condition isn't matched discards 678bb00 added umount command for self-mounted devices discards e57f51b removed unneccessary escapes discards 29b8c26 backgrounded entire task, added error checks and log output discards 9f875e0 dash's echo does not understand -e, thus removed discards 0c35e74 fixed syntax error stemming from copypasta discards 7aa953d executable bit was missing discards 6210f63 make sure file permissions are correct, even when copying from vfat; make sure all keys are generated before storing on media discards 945cabd renamed 2510-x2go-getopensshportableclientkey -> 2270-getsshclientkeysfrommedia as the contents have been changed to a more generic form - it is now no longer specific to X2Go discards ca187d4 added script to add and store SSH host keys when proper media is present discards 7515680 fixed missing escapes discards 39070ec added comments explaining default values discards 8b6ca5d rearranged detection sequence of throttling commands, also, rearranged parameter sequence to match trickle defaults: -d -u -t -l -L; Added code to determine maximum line speed for "u" values discards c94fd94 changed throttling code so it allows for "unlimited" values by specifying "u" instead of a number discards fe5a07e added trickle package, to limit bandwidth usage; added bandwidth throttling code: single throttle value limits upstream; if multiple values are specified, first is upstream, second is downstream discards 54a4354 fixed useless use of cat made sure double/single quotes work for parameters with spaces discards 0944a64 fix to display timestamp/version information regardless of squashfs file name discards 84d1c06 quoting fixed discards 3182872 syntaxfix discards 75f7968 fixed overzealous filter discards 755b4f9 added filters and quotes for some additional security, added missing escapes discards 4e86e77 replaced tr ' ' '\n' with the more elaborate sed -e 's/ \([^ ]*\)=/\n\1=/g' to catch blanks in values discards c9ec6a9 added support for blanks in session names (no quotes required in parameter) discards b64dbb8 replaced tr ' ' '\n' with the more elaborate sed -e 's/ \([^ ]*\)=/\n\1=/g' to catch blanks in values discards 2704523 commented out i386-only package (geode Xorg driver) discards 183261a syntax fix discards 8a4d855 added support to preselect session via boot parameter discards 6732bcb make sure OpenBox' ToggleMaximize is disabled, or else clicking the top row of pixels will un-maximize X2GoClient discards dd76ab4 fixed regression that would allow right-click context menu again discards 0885946 fixed an error that kept Xinerama from working (would always clone screens instead) discards 1489ecc syntax fix discards 208e8cd inverted if condition, no need for a "!" here ... discards 53586c8 syntax fix discards fc63b02 syntax fixes discards d7b5526 fixed more missing escapes discards 72f4a63 fixed missing escapes discards 69234c8 added code to support background and branding parameters discards d79a8cd reversed order of timestamping output; fixed error in related logfile content creation discards 6de169e booted env and build version should go to motd, too discards 905088f nvertedsequence of timestamp and envname, fixes problem that marker for active env isn't set, also, easier on the eyes discards c9cf762 fixed a copy-paste-induced error discards ea4d294 tempdir preparation only needs to take place if we need to perform an update or if checking the timestamp failed. Also, indentation was wrong. discards 464c22a tempdir preparation only needs to take place if we need to perform an update or if checking the timestamp failed (the latter part is still missing -> next commit). Also, checking the return code didn't work as expected. Finally, some style fixes. discards 10d7219 timestamp is now checked before BWLIMIT is determined -> faster, less traffic discards 20f5120 make sure to match to end of line only discards 40a568a changed logfile format discards 42a78b7 motd and issue are now written to simultaneously; once finished, all unused VTs are reloaded to make sure they display the new /etc/issue discards d3d9773 switched to motd instead of issue.net, removed motd display from pam login so it doesn't appear twice on local login discards 3b5fab2 test: use motd instead of issue.net discards 0194f06 we need to strip the ANSI as it doesn't work in issue.net via SSH discards 7b49458 looks like debian-live doesn't use /var/run/banner discards f952248 further speed improvements, also, enable banner in sshd config if it was disabled discards bed2b4f speed optimization, also addedoutputto /var/run/banner where ssh should pick it up discards ebc9bd4 variable name was wrong discards 5c4ad21 mountpoint detection must come earlier in the script, or MOUNTPOINT variable will be empty when it's already needed by other script parts discards 169e110 typofix discards 8314ccb added code to check timestamp before download discards 8a2e30d logfile will now also contain which environment is the running one discards 58f4777 write timestamps to text file, for easier querying by checkscripts discards 8ba13dd more typofixes discards ce839fc typofix discards 4097290 wget param change had unintended side effects - log file was empty. rsync does not need the tee helper construct. Various spelling fixes in log output. discards 8226035 make autoupdater show available versions before and after update discards 5bd4fdf added steps to further reduce clutter buildup, changed/improved logging discards 1b6d0c2 renamed file to better represent what it does discards b856d19 added version and booted system info output, indentation fixed discards 464b891 mproved logging: bandwidth test should now output progress bar. discards 760846a in /bin/sh, echo -en is not supported, but echo -n is and should thus be used discards dd203b1 in ramdisk mode, storage should be umounted at the end of an (attempted) upgrade discards 0f3306f only attempt umount when path is a mounted device / improved logging discards 0259692 improved logging discards c2b44f2 /bin/sh seems to insist on blank between { and # discards 22ae4ad improved logging discards ef53cf3 only rm if rsync was successful discards ffbb173 using mv would accumulate clutter in $DOWNLOADPATH if any extra files are present in the source; switched to rsync --delete and rm instead discards 6932c2f when trying to find the right storage device to deploy an update to in ramdisk mode, use read-only mounts at first discards e23269d removed a cleanup command that would umount /lib/live/mount/findiso when in ramdisk mode, which is a stupid thing to do discards 5128db6 inserted proper umount/remount_ro -> moved into subroutine, as req'd in two places discards 1e46e40 expanded logging, changed log messages discards 91b63bc increased log output discards b50808f improved logging, added error detection for mount process discards 759ab5c IMGSIZEDOWNLOAD was missing a filter that limits its content to $1 (awk-style) discards 19b3aee added sleep to increase chance that ntpdate manages to connect discards 7e4ed7e added resiliency in case download directory is missing, fixed imagesize calculation discards f9e3abb path was wrong discards 5e7445d typofix discards 4293e3e changed log output message discards e713cf3 added debug code again discards d3169f6 typofix discards 3bc7c4f do not trigger on METHOD="none" (which is set when IFACE="--all") discards 8ed71b9 autoupdate-patch for ramdisk mode discards 56b5252 added debug output discards 13ddd00 wait until regular ntpdate if-up.d call has finished discards 562d6fb /bin/sh instead of /bin/bash requires the use of "echo" instead of "echo -en" discards 611cae0 do not clear the console discards 2a82236 added missing escapes discards a151c55 removed unneccessary escapes discards 6715a01 all if-up tasks are now sent into the background and told to wait until tty becomes available also, fixed indention in tcpprint discards a05d6e4 renamed settime script discards 31a2d8c deleted script file that didn't work anyways discards 04a2e41 removed unused code discards 672e387 if-up scripts should exit with a NOP when a local network device is changing to up, rather than a real network device discards 1491b5c yet another attempt at getting logging to work discards e2cf76c next try: backgrounding this task instead of starting it when network becomes available discards 1e02593 logging was still broken discards fe2c67d create debug output in file discards cdac40c fixed HEREDOCs discards 239943c added time setting script discards 5c1fc2d no timestamp here, as clock is most likely wrong discards 8959b62 removed "wait for VT" block, as it is now in a separate script discards e6b46fb first attempt at making all if-up scripts wait until an unused VT is available for log output discards 179e461 renamed files; delete old names from git discards b933d9b renamed files to make space for a new 2000- file discards 5e36ff5 hwclock is not a package on its own, but contained in util-linux discards 7a360f3 added hwclock and ntpdate packages for future use in a set-time-on-boot script discards f658f73 moved "wait until unused VT becomes available" from 2300 to 2000 discards 9893aaf removed wrong comment discards c2be7ea improved ramdisk size calculation discards 49ea9e3 some log output was still lacking the timestamp discards aebc352 switched liveupdate to tty(next-available-VT) logging and timestamped output discards 0dfe71d removed old commented-out code discards e6732ca tty9 -> tty(first unused VT) discards 53b398b more superfluous escapes removed discards 18722b5 more missing escapes discards 3bb4053 indentation was wrong discards cf1039a and again, missing escapes discards e22dff9 last commit was incomplete, and included one escape too much per echo discards 422f930 improved log output discards f6aaea7 escape sign wass missingonce again ... discards 89fa571 added timestamps, switched log output to | tee -a /dev/tty9 like in the other scripts discards 73735c2 added timestamps to log output, fixed log output in 2200 and 2600 discards d3948cd changed script numbering to four-digit, beginning with 0100 discards 65b0fbd un-did backgrounding discards 55cda68 Variable name was wrong in one place discards c636bf0 fixes missing escape -> hostname -I was never executed discards 5a6ed83 attempt to background all network-related tasks discards 707079e we need to escape $0, as it will contain the name of the script generating the if-up.d script if we don't discards 5ea99bf added numbers to if-up.d script file names so we can enforce the sequence of execution discards 1717d3f make getsessions delete thinclient_sessions file if boot parameter was passed; make thinclientconfig wait for valid thinclient_sessions file unless broker mode is active discards 372ca24 added output: when sleeping while waiting for an IP, print out which script is waiting. discards a8896be more reliable way of determining that IP has been assigned discards 8622a83 more reliable way of determining that IP has been assigned discards 7593795 more reliable way of determining that IP has been assigned discards f07c782 2800-x2go-thinclientconfig: added quotation marks discards bcd4a8d OpenBox Keybindings need to be disabled entirely, they interfere with Xephyr and the like. discards af17804 trying to fix "cifs-utils not found" error when building netboot image while deleting apt lists to save space discards a145da3 trying to shrink the image; note: squashfs excludes must not begin with "/", "./", or "../" when using wildcards discards d1bd579 off-by-one-error discards 5717c54 make sure Alt-F4 is non-functional adds b432b4f Handle backgroundurl and brandingurl kernel options for X2Go Client's --background and --branding parameters. adds 65d1f40 Fixup last patch: more quotes, no useless use of cat. adds 674f12e Check for branding.svg when applying branding image - not background.svg. adds 6b7e053 make sure Alt-F4 is non-functional adds 2dc0325 off-by-one-error adds abab9f0 trying to shrink the image; note: squashfs excludes must not begin with "/", "./", or "../" when using wildcards adds 81ee79a trying to fix "cifs-utils not found" error when building netboot image while deleting apt lists to save space adds b025f3e OpenBox Keybindings need to be disabled entirely, they interfere with Xephyr and the like. adds 95b71dd 2800-x2go-thinclientconfig: added quotation marks adds 3f94816 more reliable way of determining that IP has been assigned adds a15fbba more reliable way of determining that IP has been assigned adds 4983dce more reliable way of determining that IP has been assigned adds f1cf658 added output: when sleeping while waiting for an IP, print out which script is waiting. adds 820a66b make getsessions delete thinclient_sessions file if boot parameter was passed; make thinclientconfig wait for valid thinclient_sessions file unless broker mode is active adds 90ef1e7 added numbers to if-up.d script file names so we can enforce the sequence of execution adds 15119df we need to escape $0, as it will contain the name of the script generating the if-up.d script if we don't adds b66b461 attempt to background all network-related tasks adds aec9d94 fixes missing escape -> hostname -I was never executed adds 35b27fd Variable name was wrong in one place adds eaf2a2f un-did backgrounding adds 7bd59cb changed script numbering to four-digit, beginning with 0100 adds 9864947 added timestamps to log output, fixed log output in 2200 and 2600 adds 6938589 added timestamps, switched log output to | tee -a /dev/tty9 like in the other scripts adds 04edee3 escape sign wass missingonce again ... adds cdc01cd improved log output adds 55cf2a8 last commit was incomplete, and included one escape too much per echo adds 655a2ec and again, missing escapes adds 8d30d6d indentation was wrong adds a9d86a5 more missing escapes adds e75d92e more superfluous escapes removed adds 98db258 tty9 -> tty(first unused VT) adds 4b66f5f removed old commented-out code adds 25b9cdb switched liveupdate to tty(next-available-VT) logging and timestamped output adds f8ba909 some log output was still lacking the timestamp adds d4d4db2 improved ramdisk size calculation adds 02ee3a3 removed wrong comment adds 4ce959f moved "wait until unused VT becomes available" from 2300 to 2000 adds f6501d2 added hwclock and ntpdate packages for future use in a set-time-on-boot script adds 8f974b4 hwclock is not a package on its own, but contained in util-linux adds bf9d1d0 renamed files to make space for a new 2000- file adds c4eaed8 renamed files; delete old names from git adds 51a85b0 first attempt at making all if-up scripts wait until an unused VT is available for log output adds dd5d2c1 removed "wait for VT" block, as it is now in a separate script adds 0c19362 no timestamp here, as clock is most likely wrong adds 63d3dda added time setting script adds 9078723 fixed HEREDOCs adds fb18ee2 create debug output in file adds fccd509 logging was still broken adds 8929fb1 next try: backgrounding this task instead of starting it when network becomes available adds 4877a17 yet another attempt at getting logging to work adds e6adc05 if-up scripts should exit with a NOP when a local network device is changing to up, rather than a real network device adds 340dfdc removed unused code adds e1f812d deleted script file that didn't work anyways adds e54868e renamed settime script adds b0cfb00 all if-up tasks are now sent into the background and told to wait until tty becomes available also, fixed indention in tcpprint adds 3376857 removed unneccessary escapes adds ed74d89 added missing escapes adds 043f850 do not clear the console adds 8361617 /bin/sh instead of /bin/bash requires the use of "echo" instead of "echo -en" adds 76832d5 wait until regular ntpdate if-up.d call has finished adds dee643c added debug output adds 1d69e1e autoupdate-patch for ramdisk mode adds 228e1a6 do not trigger on METHOD="none" (which is set when IFACE="--all") adds 1b8fcf7 typofix adds 66ad99b added debug code again adds caa8891 changed log output message adds 84f1def typofix adds 9daa18b path was wrong adds 8c854f3 added resiliency in case download directory is missing, fixed imagesize calculation adds f9b904f added sleep to increase chance that ntpdate manages to connect adds 7fe794d IMGSIZEDOWNLOAD was missing a filter that limits its content to $1 (awk-style) adds c9e5616 improved logging, added error detection for mount process adds dae2a3a increased log output adds 85042ce expanded logging, changed log messages adds a910baf inserted proper umount/remount_ro -> moved into subroutine, as req'd in two places adds afb741f removed a cleanup command that would umount /lib/live/mount/findiso when in ramdisk mode, which is a stupid thing to do adds 8ef9d17 when trying to find the right storage device to deploy an update to in ramdisk mode, use read-only mounts at first adds ab0a9b7 using mv would accumulate clutter in $DOWNLOADPATH if any extra files are present in the source; switched to rsync --delete and rm instead adds b8c9a67 only rm if rsync was successful adds c83e7e2 improved logging adds a3ab3a2 /bin/sh seems to insist on blank between { and # adds 5c6e17b improved logging adds 7b6faa2 only attempt umount when path is a mounted device / improved logging adds 49c3dd3 in ramdisk mode, storage should be umounted at the end of an (attempted) upgrade adds 2ef220a in /bin/sh, echo -en is not supported, but echo -n is and should thus be used adds 5846430 mproved logging: bandwidth test should now output progress bar. adds 04fdedb added version and booted system info output, indentation fixed adds dd651a2 renamed file to better represent what it does adds eef01db added steps to further reduce clutter buildup, changed/improved logging adds b28a492 make autoupdater show available versions before and after update adds 8f555be wget param change had unintended side effects - log file was empty. rsync does not need the tee helper construct. Various spelling fixes in log output. adds 6b6e54c typofix adds 6631e55 more typofixes adds de210f5 write timestamps to text file, for easier querying by checkscripts adds a251b88 logfile will now also contain which environment is the running one adds 079a962 added code to check timestamp before download adds e418832 typofix adds ceec20c mountpoint detection must come earlier in the script, or MOUNTPOINT variable will be empty when it's already needed by other script parts adds 69d76bc variable name was wrong adds b3a3618 speed optimization, also addedoutputto /var/run/banner where ssh should pick it up adds 4e1c7fc further speed improvements, also, enable banner in sshd config if it was disabled adds 570aabf looks like debian-live doesn't use /var/run/banner adds 8bd3644 we need to strip the ANSI as it doesn't work in issue.net via SSH adds 4b36d75 test: use motd instead of issue.net adds 814f5f2 switched to motd instead of issue.net, removed motd display from pam login so it doesn't appear twice on local login adds f234cab motd and issue are now written to simultaneously; once finished, all unused VTs are reloaded to make sure they display the new /etc/issue adds eca1cbd changed logfile format adds 8544d1e make sure to match to end of line only adds 4a0fe27 timestamp is now checked before BWLIMIT is determined -> faster, less traffic adds 73df872 tempdir preparation only needs to take place if we need to perform an update or if checking the timestamp failed (the latter part is still missing -> next commit). Also, checking the return code didn't work as expected. Finally, some style fixes. adds 743a697 tempdir preparation only needs to take place if we need to perform an update or if checking the timestamp failed. Also, indentation was wrong. adds 22adcfb fixed a copy-paste-induced error adds 3c9a566 nvertedsequence of timestamp and envname, fixes problem that marker for active env isn't set, also, easier on the eyes adds e2312ed booted env and build version should go to motd, too adds 7564e58 reversed order of timestamping output; fixed error in related logfile content creation adds 41904a0 added code to support background and branding parameters adds 7c1f365 fixed missing escapes adds 62d23fe fixed more missing escapes adds 6e84ed1 syntax fixes adds 465fbe5 syntax fix adds c5969b8 inverted if condition, no need for a "!" here ... adds 7020248 syntax fix adds bb9da76 fixed an error that kept Xinerama from working (would always clone screens instead) adds 08d1101 fixed regression that would allow right-click context menu again adds 7b4f2d4 make sure OpenBox' ToggleMaximize is disabled, or else clicking the top row of pixels will un-maximize X2GoClient adds 4f83001 added support to preselect session via boot parameter adds 1576484 syntax fix adds 425671f commented out i386-only package (geode Xorg driver) adds 391d500 replaced tr ' ' '\n' with the more elaborate sed -e 's/ \([^ ]*\)=/\n\1=/g' to catch blanks in values adds 134cc44 added support for blanks in session names (no quotes required in parameter) adds a123dad replaced tr ' ' '\n' with the more elaborate sed -e 's/ \([^ ]*\)=/\n\1=/g' to catch blanks in values adds e23cac0 added filters and quotes for some additional security, added missing escapes adds 17876c1 fixed overzealous filter adds 137174c syntaxfix adds f5a3ba4 quoting fixed adds aea30bf fix to display timestamp/version information regardless of squashfs file name adds c32b1e0 fixed useless use of cat made sure double/single quotes work for parameters with spaces adds 590e302 added trickle package, to limit bandwidth usage; added bandwidth throttling code: single throttle value limits upstream; if multiple values are specified, first is upstream, second is downstream adds 00887b8 changed throttling code so it allows for "unlimited" values by specifying "u" instead of a number adds fc93a82 rearranged detection sequence of throttling commands, also, rearranged parameter sequence to match trickle defaults: -d -u -t -l -L; Added code to determine maximum line speed for "u" values adds 41097bb added comments explaining default values adds 63a0773 fixed missing escapes adds f2aa49c added script to add and store SSH host keys when proper media is present adds aec4ae5 renamed 2510-x2go-getopensshportableclientkey -> 2270-getsshclientkeysfrommedia as the contents have been changed to a more generic form - it is now no longer specific to X2Go adds 802cb5e make sure file permissions are correct, even when copying from vfat; make sure all keys are generated before storing on media adds f1edd48 executable bit was missing adds 8632333 fixed syntax error stemming from copypasta adds 3b36432 dash's echo does not understand -e, thus removed adds c5ed5f6 backgrounded entire task, added error checks and log output adds 6b4d232 removed unneccessary escapes adds c11e112 added umount command for self-mounted devices adds 62d1ce1 separate umount added, for when the condition isn't matched adds aca77b7 added "finished" marker adds f92593b added check for already-running sshd adds 1ee37c0 changed routine to be more like GetSSHHostKeysFromMedia, also, added check so it waits until GetSSHHostKeysFromMedia is done adds 618e89a wildcards were missing for additional directories adds da56f85 added checks so only keyfiles are copied adds a9f3c9e added check so key copy routine only runs when "copysecring" boot parameter is set adds c52187c added '@' as allowed character in broker URL, sessionselect, and LDAP parameters adds 35a7952 added libfreerdp-plugins-standard so drive forwarding works with xfreerdp adds ba7168f added required dependencies for previously added package adds f345a56 config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig: fix VT switching on slow resource downloads. adds a774a3c config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig: whitespace and quoting fixups. adds bb9df34 config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig: remove magic pixel workaround, does not belong to this branch. new ea224f1 added workaround for NX "magic pixel" being active in --thinclient mode new 7c2485a changed file name as it didn't contain ".list" and thus seems to have been ignored new 4e89d4d workaround wasn't working, swapped out for now-working code new 3504532 fixed missing escape (when will I ever learn ...) new a1bfb61 temporary x2go archive path change due to server maintenance new 35d466c undid commit a45f251bddf68e498dbbcceb638be45c26c4a96e as repo is up again new a183bb6 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 f145bd7 once again, fixed missing escapes, le sigh new 4ad8046 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. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b494afb) \ N -- N -- N refs/heads/feature/openbox-magic-pixel-workaround (4ad8046) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 9 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: .../lib/live/config/2900-x2go-thinclientconfig | 41 ++++++++++++---------- 1 file changed, 22 insertions(+), 19 deletions(-) -- 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
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 4e89d4d5f26177cd1b918a613d103b0004777a53 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 6e08b09..fd82f7a 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -222,8 +222,11 @@ if [ -n "\$THROTTLEVALUES" ]; 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 /srv/git/code.x2go.org/live-build-x2go.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-magic-pixel-workaround in repository live-build-x2go. commit 3504532682343eb19c45b4af2489df6ed2575fb1 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 fd82f7a..0609975 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -223,7 +223,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 /srv/git/code.x2go.org/live-build-x2go.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-magic-pixel-workaround in repository live-build-x2go. commit a1bfb6155ef11346f2356ea7bf478baa39546320 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Nov 8 09:10:41 2017 +0100 temporary x2go archive path change due to server maintenance --- config/archives/x2go.list.chroot | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/archives/x2go.list.chroot b/config/archives/x2go.list.chroot index 51c0819..a1dbe8e 100644 --- a/config/archives/x2go.list.chroot +++ b/config/archives/x2go.list.chroot @@ -1 +1,2 @@ -deb http://packages.x2go.org/debian jessie main +#deb http://packages.x2go.org/debian jessie main +deb http://snapshots.packages.x2go.org/20171107/debian jessie main -- 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
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 7c2485a35a37c412018eac8904c489712e4dade8 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 /srv/git/code.x2go.org/live-build-x2go.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-magic-pixel-workaround in repository live-build-x2go. commit ea224f192599caa04049a5f3cec4840bd28cb123 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 223dd03..6e08b09 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -221,6 +221,11 @@ if [ -n "\$THROTTLEVALUES" ]; 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 /srv/git/code.x2go.org/live-build-x2go.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-magic-pixel-workaround in repository live-build-x2go. commit f145bd73d82f4098b56851d8a8bc8bc924ec5b7e 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 8ce93ef..a1d3c1a 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -231,10 +231,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 /srv/git/code.x2go.org/live-build-x2go.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-magic-pixel-workaround in repository live-build-x2go. commit 4ad8046deb58315feb09846a8d7ada29dfe54f0c 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 a1d3c1a..f2865f3 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -231,10 +231,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 /srv/git/code.x2go.org/live-build-x2go.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-magic-pixel-workaround in repository live-build-x2go. commit 35d466cddcf7625de387d9a648b27bcc6231c3f4 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Sat Nov 11 22:48:05 2017 +0100 undid commit a45f251bddf68e498dbbcceb638be45c26c4a96e as repo is up again --- config/archives/x2go.list.chroot | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/archives/x2go.list.chroot b/config/archives/x2go.list.chroot index a1dbe8e..51c0819 100644 --- a/config/archives/x2go.list.chroot +++ b/config/archives/x2go.list.chroot @@ -1,2 +1 @@ -#deb http://packages.x2go.org/debian jessie main -deb http://snapshots.packages.x2go.org/20171107/debian jessie main +deb http://packages.x2go.org/debian jessie main -- 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
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 a183bb6ae2c476b2386f5496860feda96bbeb5ff 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 0609975..8ce93ef 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -222,12 +222,25 @@ if [ -n "\$THROTTLEVALUES" ]; 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 /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git