[live-build-x2go] branch feature/openbox-magic-pixel-workaround-buster-heuler-bpo created (now 9e3f8dc)
This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/openbox-magic-pixel-workaround-buster-heuler-bpo in repository live-build-x2go. at 9e3f8dc 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. This branch includes the following new commits: new cd29107 added backported linux kernel image (not sure if this works ...) new afc5e5a updated bpo repository name new 2be3e6a do not background task in initrd new d234e90 blankdpmsfix now also supports passing a time value new 353681a persistent installations would shut down immediately on boot when .halt file was present, so we make sure to delete it and sync the disk new 6796c6a /dev/disxk/by-label may contain "\x20" for blanks, this needs to be interpreted, "echo -e" is the way to do this. new ba2f639 Revert "/dev/disxk/by-label may contain "\x20" for blanks, this needs to be" new 9e3f8dc 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. 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 feature/openbox-magic-pixel-workaround-buster-heuler-bpo in repository live-build-x2go. commit cd2910716cbcd2be3481e0a1b6c1d0a16f0f2706 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Jan 28 00:27:24 2018 +0100 added backported linux kernel image (not sure if this works ...) --- config/package-lists/backports.list.chroot | 1 + 1 file changed, 1 insertion(+) diff --git a/config/package-lists/backports.list.chroot b/config/package-lists/backports.list.chroot new file mode 100644 index 0000000..e1b3ca8 --- /dev/null +++ b/config/package-lists/backports.list.chroot @@ -0,0 +1 @@ +linux-image-amd64/stretch-backports -- 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-bpo in repository live-build-x2go. commit d234e9063b964d77ec5db37f591f2652ef057aa9 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-bpo in repository live-build-x2go. commit 2be3e6a819d1395f691e51a152a89632392057d9 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jun 30 16:17:38 2020 +0200 do not background task in initrd --- config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix b/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix index 92a666b..43725b7 100755 --- a/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix +++ b/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix @@ -25,6 +25,7 @@ fi sed \ -e 's#/bin/bash#/bin/sh#' \ -e '/^echo -n/d' \ + -e 's/ &$//' \ -e 's/early/initrd/g' \ -e 's/Early/Initrd/g' \ ../../lib/live/config/0000-earlyblankdpmsfix >"${DESTDIR}/lib/live/boot/0000-initrdblankdpmsfix" -- 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-bpo in repository live-build-x2go. commit afc5e5a15316048ee0cfd02df40f46ea8bdacfa0 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jun 30 00:00:26 2020 +0200 updated bpo repository name --- config/package-lists/backports.list.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/package-lists/backports.list.chroot b/config/package-lists/backports.list.chroot index e1b3ca8..b3c6634 100644 --- a/config/package-lists/backports.list.chroot +++ b/config/package-lists/backports.list.chroot @@ -1 +1 @@ -linux-image-amd64/stretch-backports +linux-image-amd64/buster-backports -- 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-bpo in repository live-build-x2go. commit 353681af34d3706bf353c463006480c43821e216 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-bpo in repository live-build-x2go. commit ba2f639e756e9a9cfce233c14b9dd215a84d6bf7 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Aug 22 19:39:59 2020 +0200 Revert "/dev/disxk/by-label may contain "\x20" for blanks, this needs to be" This reverts commit b5efa0f1364163765493bb86ee17d426d0bdc244. --- 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 9f29e14..17ad29f 100755 --- a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia +++ b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia @@ -84,7 +84,7 @@ GetSSHHostKeysFromMedia () LABELMPLIST=$(lsblk -oLABEL,RM,NAME,MOUNTPOINT -ln) 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 - [ "$(echo -e "$LABELLIST")" = "$LSBLKLIST" ] && break + [ "$LABELLIST" = "$LSBLKLIST" ] && break sleep 1 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-buster-heuler-bpo in repository live-build-x2go. commit 6796c6a8e48b1907e4b1dccbaef752bd40bbc1ab Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Aug 22 18:16:55 2020 +0200 /dev/disxk/by-label may contain "\x20" for blanks, this needs to be interpreted, "echo -e" is the way to do this. --- 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..9f29e14 100755 --- a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia +++ b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia @@ -84,7 +84,7 @@ GetSSHHostKeysFromMedia () LABELMPLIST=$(lsblk -oLABEL,RM,NAME,MOUNTPOINT -ln) 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 + [ "$(echo -e "$LABELLIST")" = "$LSBLKLIST" ] && break sleep 1 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-buster-heuler-bpo in repository live-build-x2go. commit 9e3f8dc870ac49b49f56121f718c0f046f3ec183 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
-
git-admin＠x2go.org