This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch heuler/openbox-magic-pixel-workaround-bookworm in repository live-build-x2go. at c782921 removed bashism as we are forced to use dash in bookworm This branch includes the following new commits: new 3a9e8ba changed fuse to fuse3 new ab6f711 changed bullseye to bookworm new 765935d de-array-ified, as we are forced to use dash instead of bash new e8c8708 de-array-ified, as we are forced to use dash instead of bash new a8bf07c typofix new d5c76d0 this will now properly terminate all backgrounded child processes when X11 dies new 6487246 make sure kdrive sessions always end up in fullscreen mode unless it's a minidesktop new c782921 removed bashism as we are forced to use dash in bookworm The 8 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 heuler/openbox-magic-pixel-workaround-bookworm in repository live-build-x2go. commit 3a9e8baa313b7502a5315d29960fd0c97679352c Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 15 15:29:54 2024 +0100 changed fuse to fuse3 --- config/package-lists/fuseext.list.chroot | 2 +- config/package-lists/live.list.chroot | 2 +- config/package-lists/ntfs.list.chroot | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/package-lists/fuseext.list.chroot b/config/package-lists/fuseext.list.chroot index 2011124..3ccacf9 100644 --- a/config/package-lists/fuseext.list.chroot +++ b/config/package-lists/fuseext.list.chroot @@ -1,3 +1,3 @@ -fuse +fuse3 fuseext2 libfuse2 diff --git a/config/package-lists/live.list.chroot b/config/package-lists/live.list.chroot index 3c8d189..230dd6a 100644 --- a/config/package-lists/live.list.chroot +++ b/config/package-lists/live.list.chroot @@ -1,7 +1,7 @@ cifs-utils console-setup console-setup-linux -fuse +fuse3 gpg initramfs-tools kbd diff --git a/config/package-lists/ntfs.list.chroot b/config/package-lists/ntfs.list.chroot index da18f0e..b5516d5 100644 --- a/config/package-lists/ntfs.list.chroot +++ b/config/package-lists/ntfs.list.chroot @@ -1,4 +1,4 @@ -fuse +fuse3 libfuse2 libgcrypt20 #libgnutls-deb0-28 -- 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/openbox-magic-pixel-workaround-bookworm in repository live-build-x2go. commit ab6f71134545d2d5972962e5ab1b734134d7304c Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 15 16:00:19 2024 +0100 changed bullseye to bookworm --- 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 3779184..b18a16a 100644 --- a/config/archives/x2go.list.chroot +++ b/config/archives/x2go.list.chroot @@ -1 +1 @@ -deb http://packages.x2go.org/debian bullseye main +deb http://packages.x2go.org/debian bookworm 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 heuler/openbox-magic-pixel-workaround-bookworm in repository live-build-x2go. commit a8bf07ca014b2b7cd2949a3e95db4256ff5c6b71 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jan 23 14:10:26 2024 +0100 typofix --- 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 c410940..ae3f681 100644 --- a/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient +++ b/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient @@ -99,7 +99,7 @@ if [ -n "$THROTTLEVALUES" ]; then if [ -n "$THROTTLEARR4" ] ; then THROTTLELENGTH="-l $THROTTLEARR4" # default 20 fi - if [ -n "${THROTTLEARR5" ] ; then + if [ -n "$THROTTLEARR5" ] ; then THROTTLELATENCY="-L $THROTTLEARR5" # default 0 fi # only set THROTTLINGCOMMAND if at least one value was detected and sanitized properly -- 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/openbox-magic-pixel-workaround-bookworm in repository live-build-x2go. commit d5c76d0d470826b451f8cc82d9012e528a21d9f0 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 863b3fe..b52ef40 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/openbox-magic-pixel-workaround-bookworm in repository live-build-x2go. commit e8c8708d18869405371cf105eb33314a454dfff6 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jan 23 14:05:01 2024 +0100 de-array-ified, as we are forced to use dash instead of bash --- .../etc/X11/Xsession.d/61x11-start-x2goclient | 38 +++++++++++++--------- 1 file changed, 23 insertions(+), 15 deletions(-) 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..c410940 100644 --- a/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient +++ b/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient @@ -72,27 +72,35 @@ if [ -n "$THROTTLEVALUES" ]; then MAXSPEEDMBIT=$(grep -l "up" /sys/class/net/*/operstate | xargs -n1 dirname | xargs -n 1 -I XXX cat XXX/speed 2>/dev/null | sort -n -u | tail -1 | tr -dc '0-9.') MAXSPEEDKBYTE=$((MAXSPEEDMBIT*128)) #Megabit * 1024 / 8 -> KiloByte - THROTTLEARR=($(echo $THROTTLEVALUES | awk -F ':' '$1 ~/^[0-9\.u]*$/ && $2 ~/^[0-9\.u]*$/ && $3 ~/^[0-9\.u]*$/ && $4 ~/^[0-9\.u]*$/ && $4 ~/^[0-9\.u]*$/ { print $1 " " $2 " " $3 " " $4 " " $5}')) - if [ -n "${THROTTLEARR[0]}" ] && [ "${THROTTLEARR[0]}" != "u" ]; then - THROTTLEDOWN="-d ${THROTTLEARR[0]}" # default 10, never used - elif [ "${THROTTLEARR[0]}" = "u" ]; then + THROTTLEARR=$(echo $THROTTLEVALUES | awk -F ':' '$1 ~/^[0-9\.u]*$/ && $2 ~/^[0-9\.u]*$/ && $3 ~/^[0-9\.u]*$/ && $4 ~/^[0-9\.u]*$/ && $4 ~/^[0-9\.u]*$/ { print $1 " " $2 " " $3 " " $4 " " $5}') + + THROTTLEARR1=$(echo $THROTTLEARR | cut -d ' ' -f 1) + THROTTLEARR2=$(echo $THROTTLEARR | cut -d ' ' -f 2) + THROTTLEARR3=$(echo $THROTTLEARR | cut -d ' ' -f 3) + THROTTLEARR4=$(echo $THROTTLEARR | cut -d ' ' -f 4) + THROTTLEARR5=$(echo $THROTTLEARR | cut -d ' ' -f 5) + + + if [ -n "$THROTTLEARR1" ] && [ "$THROTTLEARR1" != "u" ]; then + THROTTLEDOWN="-d $THROTTLEARR1" # default 10, never used + elif [ "$THROTTLEARR1" = "u" ]; then THROTTLEDOWN="-d $MAXSPEEDKBYTE" fi - if [ -n "${THROTTLEARR[1]}" ] && [ "${THROTTLEARR[1]}" != "u" ]; then - THROTTLEUP="-u ${THROTTLEARR[1]}" # default 10, never used - elif [ "${THROTTLEARR[1]}" = "u" ]; then + if [ -n "$THROTTLEARR2" ] && [ "$THROTTLEARR2" != "u" ]; then + THROTTLEUP="-u $THROTTLEARR2" # default 10, never used + elif [ "$THROTTLEARR2" = "u" ]; then THROTTLEUP="-d $MAXSPEEDKBYTE" - elif [ -z "${THROTTLEARR[1]}" ] ; then - THROTTLEUP="-d ${THROTTLEARR[0]}" # set up=down if only 1 param + elif [ -z "$THROTTLEARR2" ] ; then + THROTTLEUP="-d $THROTTLEARR1" # set up=down if only 1 param fi - if [ -n "${THROTTLEARR[2]}" ] ; then - THROTTLETIME="-t ${THROTTLEARR[2]}" # default 3.0 + if [ -n "$THROTTLEARR3" ] ; then + THROTTLETIME="-t $THROTTLEARR3" # default 3.0 fi - if [ -n "${THROTTLEARR[3]}" ] ; then - THROTTLELENGTH="-l ${THROTTLEARR[3]}" # default 20 + if [ -n "$THROTTLEARR4" ] ; then + THROTTLELENGTH="-l $THROTTLEARR4" # default 20 fi - if [ -n "${THROTTLEARR[4]}" ] ; then - THROTTLELATENCY="-L ${THROTTLEARR[4]}" # default 0 + if [ -n "${THROTTLEARR5" ] ; then + THROTTLELATENCY="-L $THROTTLEARR5" # default 0 fi # only set THROTTLINGCOMMAND if at least one value was detected and sanitized properly if [ -n "$THROTTLEUP" ] || [ -n "$THROTTLEDOWN" ] || [ -n "$THROTTLETIME" ] || [ -n "$THROTTLELENGTH" ] || [ -n "$THROTTLELATENCY" ]; then -- 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/openbox-magic-pixel-workaround-bookworm in repository live-build-x2go. commit 765935dcdabc23450d08d7ea1c2cbcb41ae2f9d7 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/openbox-magic-pixel-workaround-bookworm in repository live-build-x2go. commit 648724606c833692aecc87ef8bf7c54f648122ab Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jan 23 21:46:30 2024 +0100 make sure kdrive sessions always end up in fullscreen mode unless it's a minidesktop --- .../etc/X11/Xsession.d/60x11-kdrive-enforce-fullscreen | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-kdrive-enforce-fullscreen b/config/includes.chroot/etc/X11/Xsession.d/60x11-kdrive-enforce-fullscreen new file mode 100644 index 0000000..f41813f --- /dev/null +++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-kdrive-enforce-fullscreen @@ -0,0 +1,18 @@ +# In Minidesktops, Users might actually want to run an X2Go-KDrive session that doesn't span the entire screen +if ! [ -f "/etc/x2go/x2gothinclient-minidesktop_start" ] ; then + ( + while true ; do + if ps -C x2gokdriveclient --no-header >/dev/null; then + # whenever x2gokdriveclient loads, make sure it is forced into fullscreen + xdotool search --onlyvisible --classname --maxdepth 1 x2gokdriveclient behave %@ focus windowsize $(xdotool getdisplaygeometry) & + TOOLPID=$! + xdotool search --onlyvisible --classname --maxdepth 1 x2gokdriveclient behave %@ blur windowsize $(xdotool getdisplaygeometry) + kill $TOOLPID + else + # exit if X11 is no longer running, else sleep for a bit + ps -C Xorg || exit 0 + sleep 1 + 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/openbox-magic-pixel-workaround-bookworm in repository live-build-x2go. commit c782921429a5afd62c8757f6c198816221de4323 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Jan 28 14:48:53 2024 +0100 removed bashism as we are forced to use dash in bookworm --- config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground b/config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground index cfdab6a..156b801 100644 --- a/config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground +++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground @@ -7,7 +7,7 @@ if [ -n "$XROOT" ] ; then #input validation # allowed values for POSITION: center fill max scale tile; default: max - case "${XROOTMODE,,}" in # force lowercase + case "$(echo $XROOTMODE | tr '[:upper:]' '[:lower:]')" in # force lowercase "center") POSITION=center ;; "fill") POSITION=fill ;; "scale") POSITION=scale ;; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git