This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch heuler/mate-minidesktop-bookworm in repository live-build-x2go. commit 363eb46a5e16b7672cc247a846e0e32ed688d785 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Fri Jan 26 01:04:47 2024 +0100 changed from bullseye heuler to bookworm stable --- 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 d0592f1..8fcacf1 100644 --- a/config/archives/x2go.list.chroot +++ b/config/archives/x2go.list.chroot @@ -1 +1 @@ -deb http://packages.x2go.org/debian bullseye heuler +deb http://packages.x2go.org/debian bookworm main extras -- 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 heuler/mate-minidesktop-bookworm in repository live-build-x2go. commit 95fec1ca649991125c65e60b1ed21cc4a53374f1 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jan 23 21:45:04 2024 +0100 this will now properly terminate all backgrounded child processes when X11 dies --- .../includes.chroot/etc/X11/Xsession.d/60x11-magic-pixel-workaround | 4 ++++ 1 file changed, 4 insertions(+) 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..c02fb2d 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 @@ -6,6 +6,8 @@ if grep 'nomagicpixel=2' /proc/cmdline ; then done ; echo -en "\n$(date +'%F | %T | ')'$0' spawning window foreground monitor (magic-pixel-fix 2)." | tee -a /dev/tty8 xdotool search --class X2GoAgent behave %@ blur windowmap || xdotool search --class NXAgent behave %@ blur windowmap + # exit if X11 is no longer running, else sleep for a bit + ps -C Xorg || exit 0 done & 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 @@ -18,6 +20,8 @@ elif grep 'nomagicpixel=1' /proc/cmdline ; then killall openbox echo -en "\n$(date +'%F | %T | ')'$0' killed OpenBox." | tee -a /dev/tty8 done + # exit if X11 is no longer running, else sleep for a bit + ps -C Xorg || exit 0 sleep 1 # to save cpu cycles done & 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 heuler/mate-minidesktop-bookworm in repository live-build-x2go. commit 0f7ddcada6b3e75d3dcf87cee7540b3f13861a1f Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jan 23 13:54:32 2024 +0100 de-array-ified, as we are forced to use dash instead of bash --- .../etc/X11/Xsession.d/60x11-blanking-dpms-config | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-blanking-dpms-config b/config/includes.chroot/etc/X11/Xsession.d/60x11-blanking-dpms-config index 4aad736..e80df32 100644 --- a/config/includes.chroot/etc/X11/Xsession.d/60x11-blanking-dpms-config +++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-blanking-dpms-config @@ -2,8 +2,11 @@ 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 + DPMSARR=$(echo $BLANKINGTIME | awk -F ':' '$1 ~/^[0-9]*$/ && $2 ~/^[0-9]*$/ && $3 ~/^[0-9]*$/ { print $1 " " $2 " " $3}') + DPMSARR1=$(echo $DPMSARR | cut -d ' ' -f 1) + DPMSARR2=$(echo $DPMSARR | cut -d ' ' -f 2) + DPMSARR3=$(echo $DPMSARR | cut -d ' ' -f 3) + if [ $DPMSARR1 -eq 0 ]; then # Disable screensaver and DPMS Power Saving if requested xset s off if grep -q '\W*nodpms\W*' /proc/cmdline; then @@ -11,10 +14,10 @@ if [ -n "$BLANKINGTIME" ]; then fi else xset s on - xset s ${DPMSARR[0]} + xset s $DPMSARR1 if ! grep -q '\W*nodpms\W*' /proc/cmdline; then # Yes, "+dpms dpms" is intentional. - xset +dpms dpms ${DPMSARR[0]} ${DPMSARR[1]} ${DPMSARR[2]} + xset +dpms dpms $DPMSARR1 $DPMSARR2 $DPMSARR3 fi fi 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 heuler/mate-minidesktop-bookworm in repository live-build-x2go. commit a5bcbe9fec8e4e9447a991cae50c282db21736c5 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Fri Jan 26 15:38:40 2024 +0100 added backgrounded task to grab X2GoClient on Startup and move it to the right --- .../999_x2gothinclient-align-right | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/config/includes.chroot/etc/x2go/x2gothinclient_init.d/999_x2gothinclient-align-right b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/999_x2gothinclient-align-right new file mode 100644 index 0000000..9b240c8 --- /dev/null +++ b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/999_x2gothinclient-align-right @@ -0,0 +1,36 @@ +#!/bin/bash +# move X2GoClient window to right screen border and resize - but only +# when in minidesktop mode +if [ -z "$X2GO_HANDLE_DAEMON" ] ; then + # we need to background this so it doesn't block the startup + ( + # we have at least two matching window ids: + # actual client window and taskbar icon + # so let's wait until we have them both + X2GOCLIENTWINDOWIDS="" + while [ $(echo -e "$X2GOCLIENTWINDOWIDS" | wc -l) -lt 2 ] ; do + X2GOCLIENTWINDOWIDS=$(xdotool search --onlyvisible --name X2GoClient) + done + + # now wait until there is only one window id left that's visible and + # which matches our expected window name + while [ $(echo -e "$X2GOCLIENTWINDOWIDS" | wc -l) -gt 1 ] ; do + X2GOCLIENTWINDOWIDS=$(xdotool search --onlyvisible --name X2GoClient) + done + + # while there SHOULD be only one ID left by now ... + # let's handle this in a safe manner - as a list + for WINDOW in $X2GOCLIENTWINDOWIDS; do + # the id belonging to the taskbar icon cannot be activated + # xdotool does not return a non-zero error code when windowactivate + # fails, so we need to check for the presence of an error message + if xdotool windowactivate $WINDOW 2>/dev/null; then + # if we succeeded in activating the window, + # it's the actual client window + sleep 0.5s + xdotool windowsize $WINDOW 30% 100% # resize it + xdotool windowmove $WINDOW 70% 0 # move it to the right + fi + done + ) & +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 heuler/mate-minidesktop-bookworm in repository live-build-x2go. commit 132c5961aacb023cccffc3bd304207d327e9942a Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Fri Jan 26 19:09:16 2024 +0100 fixed logic, added comments, added default size and /proc/cmdline parameter --- .../940_x2gothinclient-align-right | 79 +++++++++++++--------- 1 file changed, 46 insertions(+), 33 deletions(-) diff --git a/config/includes.chroot/etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right index 9b240c8..7e4b460 100755 --- a/config/includes.chroot/etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right +++ b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right @@ -1,36 +1,49 @@ #!/bin/bash -# move X2GoClient window to right screen border and resize - but only -# when in minidesktop mode +# move X2GoClient window to right screen border and resize - but only when in minidesktop mode + +WINDOWWIDTH=$(cat /proc/cmdline | tr ' ' '\n' | awk -F'=' '"windowwidth"==$1 {print $2}' | tr -dc '0-9') + +# default to 50(%) if unset +if [ -z "$WINDOWWIDTH" ]; then + WINDOWWIDTH=50" +fi + if [ -z "$X2GO_HANDLE_DAEMON" ] ; then - # we need to background this so it doesn't block the startup - ( - # we have at least two matching window ids: - # actual client window and taskbar icon - # so let's wait until we have them both - X2GOCLIENTWINDOWIDS="" - while [ $(echo -e "$X2GOCLIENTWINDOWIDS" | wc -l) -lt 2 ] ; do - X2GOCLIENTWINDOWIDS=$(xdotool search --onlyvisible --name X2GoClient) - done - - # now wait until there is only one window id left that's visible and - # which matches our expected window name - while [ $(echo -e "$X2GOCLIENTWINDOWIDS" | wc -l) -gt 1 ] ; do - X2GOCLIENTWINDOWIDS=$(xdotool search --onlyvisible --name X2GoClient) - done - - # while there SHOULD be only one ID left by now ... - # let's handle this in a safe manner - as a list - for WINDOW in $X2GOCLIENTWINDOWIDS; do - # the id belonging to the taskbar icon cannot be activated - # xdotool does not return a non-zero error code when windowactivate - # fails, so we need to check for the presence of an error message - if xdotool windowactivate $WINDOW 2>/dev/null; then - # if we succeeded in activating the window, - # it's the actual client window - sleep 0.5s - xdotool windowsize $WINDOW 30% 100% # resize it - xdotool windowmove $WINDOW 70% 0 # move it to the right - fi - done - ) & + # we need to background this so it doesn't block the startup + ( + # wait for window ids to show up + X2GOCLIENTWINDOWIDS="" + while [ -z "$X2GOCLIENTWINDOWIDS" ] ; do + # if this var is of nonzero length, we have at least one matching window id: + # the actual client window and possibly the taskbar icon + X2GOCLIENTWINDOWIDS=$(xdotool search --onlyvisible --name X2GoClient) + # make sure we terminate if X11 terminates + ps -C Xorg || exit 0 + done + + while [ $(echo -n "$X2GOCLIENTWINDOWIDS" | wc -l) -gt 2 ] ; do + # now wait until there is only one window id left that's visible and + # which matches our expected window name + X2GOCLIENTWINDOWIDS=$(xdotool search --onlyvisible --name X2GoClient) + # make sure we terminate if X11 terminates + ps -C Xorg || exit 0 + done + + # while there SHOULD be only one ID left by now ... + # let's handle this in a safe manner - as a list + for WINDOW in $X2GOCLIENTWINDOWIDS; do + # the id belonging to the taskbar icon cannot be activated + # xdotool does not return a non-zero error code when windowactivate + # fails, so we need to check for the presence of an error message + if xdotool windowactivate $WINDOW 2>/dev/null; then + # if we succeeded in activating the window, + # it's the actual client window + sleep 0.5s + xdotool windowsize $WINDOW ${WINDOWWIDTH}% 100% # resize it + xdotool windowmove $WINDOW $((100-WINDOWWIDTH))% 0 # move it to the right + fi + # make sure we terminate if X11 terminates + ps -C Xorg || exit 0 + done + ) & 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 heuler/mate-minidesktop-bookworm in repository live-build-x2go. commit b5438d7dc8b0ee0a665e1c6352d5cc087a13ca00 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Fri Jan 26 19:20:16 2024 +0100 sanitize input --- .../etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/includes.chroot/etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right index 7e4b460..960f9a5 100755 --- a/config/includes.chroot/etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right +++ b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/940_x2gothinclient-align-right @@ -3,6 +3,11 @@ WINDOWWIDTH=$(cat /proc/cmdline | tr ' ' '\n' | awk -F'=' '"windowwidth"==$1 {print $2}' | tr -dc '0-9') +# sanitize input +if [ $WINDOWWIDTH -lt 0 ] || [ $WINDOWWIDTH -gt 101 ]; then + unset $WINDOWWIDTH +fi + # default to 50(%) if unset if [ -z "$WINDOWWIDTH" ]; then WINDOWWIDTH=50" -- 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 heuler/mate-minidesktop-bookworm in repository live-build-x2go. commit 0987d995ce13e145b69e0e622b33d02c7a13e092 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Fri Jun 19 21:01:54 2020 +0000 only run kill command if there's actually a process id to kill --- config/includes.chroot/etc/network/if-up.d/0100-show-sysconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/etc/network/if-up.d/0100-show-sysconf b/config/includes.chroot/etc/network/if-up.d/0100-show-sysconf index 14ac8a4..92b4664 100755 --- a/config/includes.chroot/etc/network/if-up.d/0100-show-sysconf +++ b/config/includes.chroot/etc/network/if-up.d/0100-show-sysconf @@ -48,5 +48,5 @@ fi [ -n "$TIMESTAMP" ] && echo "- Build Version: $TIMESTAMP ($HUMANTIMESTAMP)" | tee -a /etc/motd >> /etc/issue # make sure all unused VTs show the new /etc/issue - ps -C getty --no-header | awk '{ print $1 }' | xargs -n 1 kill -1 + ps -C getty --no-header | awk '{ print $1 }' | xargs -n 1 --no-run-if-empty kill -1 ) & -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git