This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-magic-pixel-workaround-buster-heuler in repository live-build-x2go. commit be0c49c0031bb77481a2f4e21afeed58b2659dc1 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jun 30 16:36:46 2020 +0200 blankdpmsfix now also supports passing a time value --- .../etc/X11/Xsession.d/60x11-blanking-dpms-config | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 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 128c503..4aad736 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 @@ -1,7 +1,4 @@ # code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) -if grep -q '\W*blankdpmsfix\W*' /proc/cmdline; then - xset dpms force suspend -fi 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 @@ -23,6 +20,15 @@ if [ -n "$BLANKINGTIME" ]; then fi if grep -q '\W*blankdpmsfix\W*' /proc/cmdline; then + SLEEPTIME=$(cat /proc/cmdline | tr ' ' '\n' | awk -F'=' '"blankdpmsfix"==$1 {print $2}' | tr -dc '0-9') + # SLEEPTIME is a value set in milliseconds -- not microseconds and not seconds either + [ -z "$SLEEPTIME" ] && SLEEPTIME=1000 # so we default to 1000 milliseconds = 1 second + SLEEPTIME=$(echo $SLEEPTIME | awk '{ printf "%s", $1/1000 }') # awk works for fractions so we don't need bc + SLEEPCOMMAND="/bin/sleep $SLEEPTIME" + + #xset dpms force suspend + xset dpms force off + $SLEEPCOMMAND xset dpms force on xset dpms 0 0 0 xset -dpms -- 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-buster-heuler in repository live-build-x2go. commit 6a8a707fb5aab8574f6aaf5219ff306bfcb8227c Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Wed Aug 19 22:14:15 2020 +0200 persistent installations would shut down immediately on boot when .halt file was present, so we make sure to delete it and sync the disk --- config/includes.chroot/lib/live/config/2800-x2go-powerbuttonmonitor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-powerbuttonmonitor b/config/includes.chroot/lib/live/config/2800-x2go-powerbuttonmonitor index cb8d29c..7285918 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-powerbuttonmonitor +++ b/config/includes.chroot/lib/live/config/2800-x2go-powerbuttonmonitor @@ -9,9 +9,9 @@ echo -n " x2go-powerbuttonmonitor" # determine poweroff-command if grep -q "\W*fastpo\W*" /proc/cmdline && ! [ -d ~x2gothinclient ] ; then # this does not make sense for the minidesktop - POWEROFFCOMMAND='while ! (grep "^/dev/" /etc/mtab | grep -q rw ) ; do echo s >/proc/sysrq-trigger ; echo u >/proc/sysrq-trigger ; done ; echo o >/proc/sysrq-trigger' + POWEROFFCOMMAND='rm -f /home/user/.halt ; sync ; while ! (grep "^/dev/" /etc/mtab | grep -q rw ) ; do echo s >/proc/sysrq-trigger ; echo u >/proc/sysrq-trigger ; done ; echo o >/proc/sysrq-trigger' else - POWEROFFCOMMAND='poweroff' + POWEROFFCOMMAND='rm -f /home/user/.halt ; sync ; poweroff' fi # Spawn Powerbutton-Monitor -- 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-buster-heuler in repository live-build-x2go. commit b3ca67d19d93a8025be49bd33a768cee3958750b Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Aug 22 19:45:06 2020 +0200 Labels with blanks need to have their blanks replaced with \x20, else the comparison with /dev/disk/by-label will fail; lsblk -r instad of lsblk -l does that. --- config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia index 17ad29f..a3fa000 100755 --- a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia +++ b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia @@ -81,7 +81,7 @@ GetSSHHostKeysFromMedia () LABELLIST=$(ls -1 /dev/disk/by-label/ | sort -u | tr '\n' '|') # generated from /dev/disk/by-label/ echo -n "\n$(date +'%F | %T | ')'$0' Status of /dev/disk/by-label: '$LABELLIST'." | tee -a /dev/tty8 - LABELMPLIST=$(lsblk -oLABEL,RM,NAME,MOUNTPOINT -ln) + LABELMPLIST=$(lsblk -oLABEL,RM,NAME,MOUNTPOINT -rn) LSBLKLIST=$(echo "$LABELMPLIST" | grep -v "^ " | awk '{print $1}' | sort -u | tr '\n' '|') # generated from lsblk echo -n "\n$(date +'%F | %T | ')'$0' Status of lsblk: '$LSBLKLIST'." | tee -a /dev/tty8 [ "$LABELLIST" = "$LSBLKLIST" ] && break -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git