[live-build-x2go] branch feature/openbox-magic-pixel-workaround-bullseye created (now 900fbb4)
This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/openbox-magic-pixel-workaround-bullseye in repository live-build-x2go. at 900fbb4 updated path so it works for buster and bullseye This branch includes the following new commits: new bf8faf4 Update to bullseye new dd36dee package x11vnc-data no longer exists new 47a0eee manually enforce fullscreen even if thinclient mode is set new f31a330 Revert "manually enforce fullscreen even if thinclient mode is set" - won't help, the issue is systemd not starting openbox (due to a package outside the git tree requiring systemd) new d09800f taking a different approach at detecting a running X2Go session - searching for the presence of a window class named "X2GoAgent" new 900fbb4 updated path so it works for buster and bullseye The 6 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. -- 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-magic-pixel-workaround-bullseye in repository live-build-x2go. commit bf8faf4606bc3e878ae8063a7c5e424801f0c130 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Mar 12 15:13:09 2022 +0100 Update to bullseye --- config/archives/x2go.list.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/archives/x2go.list.chroot b/config/archives/x2go.list.chroot index 2355b52..3779184 100644 --- a/config/archives/x2go.list.chroot +++ b/config/archives/x2go.list.chroot @@ -1 +1 @@ -deb http://packages.x2go.org/debian buster main +deb http://packages.x2go.org/debian bullseye main -- 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-magic-pixel-workaround-bullseye in repository live-build-x2go. commit dd36dee101710edc7c0cbcca720138d1ed40fd8a Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Mar 12 15:21:54 2022 +0100 package x11vnc-data no longer exists --- config/package-lists/desktop.list.chroot | 1 - 1 file changed, 1 deletion(-) diff --git a/config/package-lists/desktop.list.chroot b/config/package-lists/desktop.list.chroot index 95fdbf7..3150534 100644 --- a/config/package-lists/desktop.list.chroot +++ b/config/package-lists/desktop.list.chroot @@ -1,7 +1,6 @@ libevdev2 libmtdev1 x11vnc -x11vnc-data xserver-xorg-input-all xserver-xorg-input-wacom xserver-xorg-video-all -- 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-magic-pixel-workaround-bullseye in repository live-build-x2go. commit f31a3300ef1c99025c82b9627e5e4edb1bd618c6 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Mar 12 17:22:44 2022 +0100 Revert "manually enforce fullscreen even if thinclient mode is set" - won't help, the issue is systemd not starting openbox (due to a package outside the git tree requiring systemd) This reverts commit 47a0eee09c116ef3c47be19617c9003847f732b36. --- config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient b/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient index 0e25321..e22b47e 100644 --- a/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient +++ b/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient @@ -100,4 +100,4 @@ if [ -n "$THROTTLEVALUES" ]; then fi fi -eval $THROTTLINGCOMMAND x2goclient --thinclient --maximize --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 -- 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-magic-pixel-workaround-bullseye in repository live-build-x2go. commit 47a0eee09c116f3c47be19617c9003847f732b36 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Mar 12 17:06:04 2022 +0100 manually enforce fullscreen even if thinclient mode is set --- config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient b/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient index e22b47e..0e25321 100644 --- a/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient +++ b/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient @@ -100,4 +100,4 @@ if [ -n "$THROTTLEVALUES" ]; then 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 +eval $THROTTLINGCOMMAND x2goclient --thinclient --maximize --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-magic-pixel-workaround-bullseye in repository live-build-x2go. commit d09800f6678c45698311bc9dba2a869ef9bc8e95 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Mar 12 20:31:52 2022 +0100 taking a different approach at detecting a running X2Go session - searching for the presence of a window class named "X2GoAgent" --- .../includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround b/config/includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround index 00bb22d..863b3fe 100644 --- a/config/includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround +++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround @@ -10,11 +10,11 @@ if grep 'nomagicpixel=2' /proc/cmdline ; then elif grep 'nomagicpixel=1' /proc/cmdline ; then 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 + while [ -z "$(xdotool search --class X2GoAgent)" ] && ! 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 + while [ -n "$(xdotool search --class X2GoAgent)" ] && ps -C openbox >/dev/null ; do killall openbox echo -en "\n$(date +'%F | %T | ')'$0' killed OpenBox." | tee -a /dev/tty8 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-magic-pixel-workaround-bullseye in repository live-build-x2go. commit 900fbb46ed885a67f940640b461fd9a0d297b2f3 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Wed Sep 21 19:06:26 2022 +0200 updated path so it works for buster and bullseye --- config/includes.chroot/etc/network/if-up.d/0000-fix-resolvconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/etc/network/if-up.d/0000-fix-resolvconf b/config/includes.chroot/etc/network/if-up.d/0000-fix-resolvconf index 3578c6a..d18a2a7 100755 --- a/config/includes.chroot/etc/network/if-up.d/0000-fix-resolvconf +++ b/config/includes.chroot/etc/network/if-up.d/0000-fix-resolvconf @@ -1,6 +1,6 @@ #!/bin/bash # for some silly reason, we end up with a 0-byte-sized actual resolv.conf file in /etc, which keeps resolvconf from working if ! [ -s /etc/resolv.conf ]; then - ln -sf /etc/resolvconf/run/resolv.conf /etc/resolv.conf + ln -sf /run/resolvconf/resolv.conf /etc/resolv.conf resolvconf -u fi -- 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