[live-build-x2go] branch feature/openbox-magic-pixel-workaround updated (4ad8046 -> 481d64e)
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 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. discards f145bd7 once again, fixed missing escapes, le sigh discards 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. discards 35d466c undid commit a45f251bddf68e498dbbcceb638be45c26c4a96e as repo is up again discards a1bfb61 temporary x2go archive path change due to server maintenance discards 3504532 fixed missing escape (when will I ever learn ...) discards 4e89d4d workaround wasn't working, swapped out for now-working code discards 7c2485a changed file name as it didn't contain ".list" and thus seems to have been ignored discards ea224f1 added workaround for NX "magic pixel" being active in --thinclient mode adds 0202789 config/package-lists/x2go.list.chroot: add missing packages, "cherry-picked" from feature/heuler-xdmcpdirect. new 0995105 added workaround for NX "magic pixel" being active in --thinclient mode new cea5ed2 changed file name as it didn't contain ".list" and thus seems to have been ignored new b06ceea workaround wasn't working, swapped out for now-working code new c40d3c8 fixed missing escape (when will I ever learn ...) new 4d78b87 temporary x2go archive path change due to server maintenance new aadcd16 undid commit a45f251bddf68e498dbbcceb638be45c26c4a96e as repo is up again new eb978c1 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 cc47c74 once again, fixed missing escapes, le sigh new 481d64e 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 (4ad8046) \ N -- N -- N refs/heads/feature/openbox-magic-pixel-workaround (481d64e) 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: config/package-lists/x2go.list.chroot | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 b06ceea51efcd0ed2267de48513b4ad9ef914bb1 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 cea5ed2363420781f6a94e4fd5501030747a4b36 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 0995105ab90e12de1f4e28fceee68dc87bb4973d 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 4d78b87a6ec1740ee424f19d1380754c1bfbdcba 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 aadcd169dc15db4e01eda1f8ae1c7fde7d224a38 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 eb978c146b9313d92c03467ad1321cb774ab36ea 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
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 cc47c74df53c0d86e66da42a42800e5d3129e34e 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 c40d3c8fa55143e396029a26dae72f216dc9e9ce 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 481d64eaf40bc8ddd328ed16694f01e0d1879350 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
-
git-admin＠x2go.org