This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/mate-minidesktop-stretch in repository live-build-x2go. commit bceafa5e32d91b7350f615ad7891d27b405517a5 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Mon Dec 11 15:23:03 2017 +0100 (hopefully) fixed issue that parameters without an equals sign became appended to the preceding parameter's value --- .../lib/live/config/2900-x2go-thinclientconfig | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index 223dd03..420292d 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -28,7 +28,7 @@ cat >/home/user/.xsession <<XSESSION pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' --exit-idle-time=65535 & # additional variable instead of "case \$(...) in", as we need the value again later on -XRANDRCMDTAINTED=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | awk -F '=' '\$1 == "xinerama" { print \$2 }') +XRANDRCMDTAINTED=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F '=' '\$1 == "xinerama" { print \$2 }') # sanitize input case \$XRANDRCMDTAINTED in @@ -89,21 +89,21 @@ openbox & xsetroot -solid "#246ed8" # Get X2GoConfig -BROKERURL=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | \ +BROKERURL=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | \ awk -F'=' ' /^broker-url=/ { print \$2 }' | \ tr -dc 'a-zA-Z0-9.:/?%_\-@') -SESSIONSELECT=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | \ +SESSIONSELECT=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | \ awk -F'=' ' /^session=/ { print \$2 }' | \ tr -dc 'a-zA-Z0-9.:/ _\-@') -LDAP=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | \ +LDAP=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | \ sed 's/^ldap=/ldap#/' | \ awk -F'#' ' /^ldap#/ { print \$2 }' | \ tr -dc 'a-zA-Z0-9.:_\-@') -LDAP1=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | \ +LDAP1=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | \ sed 's/^ldap1=/ldap1#/' | \ awk -F'#' ' /^ldap1#/ { print \$2 }' | \ tr -dc 'a-zA-Z0-9.:_\-@') -LDAP2=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | \ +LDAP2=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | \ sed 's/^ldap2=/ldap2#/' | \ awk -F'#' ' /^ldap2#/ { print \$2 }' | \ tr -dc 'a-zA-Z0-9.:_\-@') @@ -164,7 +164,7 @@ else LDAPPARAMS="" fi -BLANKINGTIME=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | awk -F '=' '\$1 == "blank" { print \$2 }' | tr -dc '0-9:') +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 @@ -184,7 +184,7 @@ if [ -n "\$BLANKINGTIME" ]; then fi THROTTLINGCOMMAND="" -THROTTLEVALUES=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | awk -F '=' '\$1 == "throttle" { print \$2 }' | tr -dc '0-9.:u') +THROTTLEVALUES=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F '=' '\$1 == "throttle" { print \$2 }' | tr -dc '0-9.:u') if [ -n "\$THROTTLEVALUES" ]; then # determine maximum line speed # look for all interfaces in state "up", then read their speed value from the file named speed -- 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/mate-minidesktop-stretch in repository live-build-x2go. commit 79a9708ed5c52ab49606660b8c234b8ac51ca106 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jan 16 02:46:50 2018 +0100 improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) - second attempt --- .../lib/live/config/2900-x2go-thinclientconfig | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index 40342ad..93703b8 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -86,24 +86,10 @@ done openbox & # code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) -# it seems that a simple -# xset dpms force standby ; xset dpms force on -# isn't enough (doesn't always help), -# so let's add some resiliency and logging - if grep -q '\W*blankdpmsfix\W*' /proc/cmdline; then - while xset q | grep -q "Monitor is On" ; do - while ! xset q | grep -q "Monitor is in Standby" ; do - echo -en "\n\$(date +'%F | %T | ')'\$0' Attempting to force TFT into 'standby'." | tee -a /dev/tty8 - xset dpms force standby - echo -en "\n\$(date +'%F | %T | ')'\$0' \$(xset q | grep "Monitor is")" | tee -a /dev/tty8 - done - done - while ! xset q | grep -q "Monitor is On" ; do - echo -en "\n\$(date +'%F | %T | ')'\$0' Attempting to force TFT to 'on'." | tee -a /dev/tty8 - xset dpms force on - echo -en "\n\$(date +'%F | %T | ')'\$0' \$(xset q | grep "Monitor is")" | tee -a /dev/tty8 - done + CURRENTRES=\$(xrandr | awk '$0 ~/\*/ { print \$1}') # determine current resolution + xrandr -s 640x480 # set low resolution to trigger TFT wakeup + xrandr -s \$CURRENTRES # restore original resolution fi # set screen background to X2Go default blue on all detected screens -- 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/mate-minidesktop-stretch in repository live-build-x2go. commit b4fe579bff4ca591042541b19a311fb52a8d90ab Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Jan 13 12:05:30 2018 +0100 typofix --- config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index 420292d..471fa9c 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -170,7 +170,7 @@ if [ -n "\$BLANKINGTIME" ]; then if [ \${DPMSARR[0]} -eq 0 ]; then # Disable screensaver and DPMS Power Saving if requested xset s off - if ! grep -q '\W*nodpms\W*' /proc/cmdline; then + if grep -q '\W*nodpms\W*' /proc/cmdline; then xset -dpms fi 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 feature/mate-minidesktop-stretch in repository live-build-x2go. commit 9c75c8863d298124cc82bddcdd2a6de9f8ebc470 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 15 02:48:51 2018 +0100 added code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) --- config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index 471fa9c..f7e3b87 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -85,6 +85,12 @@ done # Spawn openbox openbox & +# 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 standby + xset dpms force on +fi + # set screen background to X2Go default blue on all detected screens xsetroot -solid "#246ed8" -- 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/mate-minidesktop-stretch in repository live-build-x2go. commit 050ccf2d561a0f1f8e78a783336c92c0096a9514 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 15 06:07:22 2018 +0100 improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) --- .../lib/live/config/2900-x2go-thinclientconfig | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index f7e3b87..40342ad 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -86,9 +86,24 @@ done openbox & # code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) +# it seems that a simple +# xset dpms force standby ; xset dpms force on +# isn't enough (doesn't always help), +# so let's add some resiliency and logging + if grep -q '\W*blankdpmsfix\W*' /proc/cmdline; then - xset dpms force standby - xset dpms force on + while xset q | grep -q "Monitor is On" ; do + while ! xset q | grep -q "Monitor is in Standby" ; do + echo -en "\n\$(date +'%F | %T | ')'\$0' Attempting to force TFT into 'standby'." | tee -a /dev/tty8 + xset dpms force standby + echo -en "\n\$(date +'%F | %T | ')'\$0' \$(xset q | grep "Monitor is")" | tee -a /dev/tty8 + done + done + while ! xset q | grep -q "Monitor is On" ; do + echo -en "\n\$(date +'%F | %T | ')'\$0' Attempting to force TFT to 'on'." | tee -a /dev/tty8 + xset dpms force on + echo -en "\n\$(date +'%F | %T | ')'\$0' \$(xset q | grep "Monitor is")" | tee -a /dev/tty8 + done fi # set screen background to X2Go default blue on all detected screens -- 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/mate-minidesktop-stretch in repository live-build-x2go. commit c7abe5da7950704f13f2121a0b32603482fc0fcf Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jan 16 02:47:26 2018 +0100 Revert "improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) - second attempt" This reverts commit 5258aff8f686e2483b0e2bec07fb4dc5f66a2fe4. --- .../lib/live/config/2900-x2go-thinclientconfig | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index 4dd16d8..40342ad 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -86,9 +86,25 @@ done openbox & # code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) -CURRENTRES=\$(xrandr | awk '$0 ~/\*/ { print \$1}') # determine current resolution -xrandr -s 640x480 # set low resolution to trigger TFT wakeup -xrandr -s \$CURRENTRES # restore original resolution +# it seems that a simple +# xset dpms force standby ; xset dpms force on +# isn't enough (doesn't always help), +# so let's add some resiliency and logging + +if grep -q '\W*blankdpmsfix\W*' /proc/cmdline; then + while xset q | grep -q "Monitor is On" ; do + while ! xset q | grep -q "Monitor is in Standby" ; do + echo -en "\n\$(date +'%F | %T | ')'\$0' Attempting to force TFT into 'standby'." | tee -a /dev/tty8 + xset dpms force standby + echo -en "\n\$(date +'%F | %T | ')'\$0' \$(xset q | grep "Monitor is")" | tee -a /dev/tty8 + done + done + while ! xset q | grep -q "Monitor is On" ; do + echo -en "\n\$(date +'%F | %T | ')'\$0' Attempting to force TFT to 'on'." | tee -a /dev/tty8 + xset dpms force on + echo -en "\n\$(date +'%F | %T | ')'\$0' \$(xset q | grep "Monitor is")" | tee -a /dev/tty8 + done +fi # set screen background to X2Go default blue on all detected screens xsetroot -solid "#246ed8" -- 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/mate-minidesktop-stretch in repository live-build-x2go. commit fdbc68f3542ef293ba650731e8d3f1d18d4ab4bf Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jan 16 11:45:18 2018 +0100 improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) - fourth attempt - using a minres with same hsync/vsync polarity --- config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index eb2741e..47e0037 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -88,7 +88,7 @@ openbox & # 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 CURRENTRES=\$(xrandr | awk '\$0 ~/\*/ { print \$1}') # determine current resolution - xrandr -s 640x480 # set low resolution to trigger TFT wakeup + xrandr -s 800x600 # set low resolution to trigger TFT wakeup while ! [ "\$(xrandr | awk '\$0 ~/\*/ { print \$1}')" = "\$CURRENTRES" ] ; do xrandr -s \$CURRENTRES # restore original resolution 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/mate-minidesktop-stretch in repository live-build-x2go. commit 728c2006384b9de848d8915b31e6cc4439074850 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Wed Jan 17 06:35:45 2018 +0100 improved code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) - fifth attempt --- .../lib/live/config/2900-x2go-thinclientconfig | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index 47e0037..6e8587b 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -27,6 +27,14 @@ cat >/home/user/.xsession <<XSESSION # Spawn PulseAudio pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' --exit-idle-time=65535 & +# 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 + for DISPLAYNAME in \$(xrandr | awk '\$2 == "connected" { print \$1 }') ; do + xrandr --output \$DISPLAYNAME --off + xrandr --output \$DISPLAYNAME --auto + done +fi + # additional variable instead of "case \$(...) in", as we need the value again later on XRANDRCMDTAINTED=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F '=' '\$1 == "xinerama" { print \$2 }') @@ -85,15 +93,6 @@ done # Spawn openbox openbox & -# 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 - CURRENTRES=\$(xrandr | awk '\$0 ~/\*/ { print \$1}') # determine current resolution - xrandr -s 800x600 # set low resolution to trigger TFT wakeup - while ! [ "\$(xrandr | awk '\$0 ~/\*/ { print \$1}')" = "\$CURRENTRES" ] ; do - xrandr -s \$CURRENTRES # restore original resolution - done -fi - # set screen background to X2Go default blue on all detected screens xsetroot -solid "#246ed8" -- 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/mate-minidesktop-stretch in repository live-build-x2go. commit fa886d511d78748a1a069bb62b7fd38f49c23181 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Wed Jan 24 09:16:36 2018 +0100 added support for ntp= boot parameter, to allow the use of non-debian ntp servers --- config/includes.chroot/lib/live/config/2000-settime | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2000-settime b/config/includes.chroot/lib/live/config/2000-settime index cb0ada3..7bbdd14 100755 --- a/config/includes.chroot/lib/live/config/2000-settime +++ b/config/includes.chroot/lib/live/config/2000-settime @@ -15,6 +15,20 @@ if [ "\$METHOD" = "loopback" ] || [ "\$METHOD" = "none" ]; then exit 0 fi +NTPSERVERS=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | \ + awk -F'=' ' /^ntp=/ { print \$2 }' | \ + tr -dc 'a-zA-Z0-9.\-' | \ + tr '[:upper:]' '[:lower:]' ) + +if [ "\$NTPSERVERS" = "false" ] || [ "\$NTPSERVERS" = "off" ] || [ "\$NTPSERVERS" = "0" ] ; then + NTPCOMMAND="false" +elif [ -n "\$NTPSERVERS" ] ; then + NTPCOMMAND="ntpdate -s -b \$NTPSERVERS" +else + NTPCOMMAND="ntpdate-debian -s -b" +fi + + ( while ! [ -c /dev/tty8 ] ; do echo -en "\n'\$0' is waiting for tty8 to become available." @@ -33,7 +47,9 @@ fi sleep 20 # make sure IP, Route, DNS are all up - if ntpdate-debian -s && hwclock --systohc ; then + if [ "\$NTPCOMMAND" = "false" ] ; then + echo -en "\n\$(date +'%F | %T | ')'\$0' - NTP disabled via boot parameter. Timestamps will be based on CMOS Clock." | tee -a /dev/tty8 + elif \$NTPCOMMAND && hwclock --systohc ; then echo -en "\n\$(date +'%F | %T | ')'\$0' - time has been set." | tee -a /dev/tty8 else echo -en "\n\$(date +'%F | %T | ')'\$0' - error setting time. Timestamps will be based on CMOS Clock." | tee -a /dev/tty8 -- 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/mate-minidesktop-stretch in repository live-build-x2go. commit aa38ff0f5ebece578eea87b89ec5c329c0c934e8 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Wed Jan 24 14:42:28 2018 +0100 passing multiple ntp server names/IPs wasn't workung; should work now --- config/includes.chroot/lib/live/config/2000-settime | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2000-settime b/config/includes.chroot/lib/live/config/2000-settime index 7bbdd14..bdd9a32 100755 --- a/config/includes.chroot/lib/live/config/2000-settime +++ b/config/includes.chroot/lib/live/config/2000-settime @@ -15,16 +15,18 @@ if [ "\$METHOD" = "loopback" ] || [ "\$METHOD" = "none" ]; then exit 0 fi -NTPSERVERS=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | \ +NTPSERVERS=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /proc/cmdline | \ awk -F'=' ' /^ntp=/ { print \$2 }' | \ - tr -dc 'a-zA-Z0-9.\-' | \ + tr -dc 'a-zA-Z0-9.\- ' | \ tr '[:upper:]' '[:lower:]' ) if [ "\$NTPSERVERS" = "false" ] || [ "\$NTPSERVERS" = "off" ] || [ "\$NTPSERVERS" = "0" ] ; then NTPCOMMAND="false" elif [ -n "\$NTPSERVERS" ] ; then + echo -en "\n\$(date +'%F | %T | ')'\$0': Using ntp server(s) '$NTPSERVERS'. First working one in list will be used." | tee -a /dev/tty8 NTPCOMMAND="ntpdate -s -b \$NTPSERVERS" else + echo -en "\n\$(date +'%F | %T | ')'\$0': Using Debian's default ntp servers." | tee -a /dev/tty8 NTPCOMMAND="ntpdate-debian -s -b" 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 feature/mate-minidesktop-stretch in repository live-build-x2go. commit 77de310ed15d221fe62e1d9389c7881d49e5e45d Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Wed Jan 24 16:04:26 2018 +0100 fixed missing escape --- config/includes.chroot/lib/live/config/2000-settime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2000-settime b/config/includes.chroot/lib/live/config/2000-settime index bdd9a32..62242a3 100755 --- a/config/includes.chroot/lib/live/config/2000-settime +++ b/config/includes.chroot/lib/live/config/2000-settime @@ -23,7 +23,7 @@ NTPSERVERS=\$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' /pr if [ "\$NTPSERVERS" = "false" ] || [ "\$NTPSERVERS" = "off" ] || [ "\$NTPSERVERS" = "0" ] ; then NTPCOMMAND="false" elif [ -n "\$NTPSERVERS" ] ; then - echo -en "\n\$(date +'%F | %T | ')'\$0': Using ntp server(s) '$NTPSERVERS'. First working one in list will be used." | tee -a /dev/tty8 + echo -en "\n\$(date +'%F | %T | ')'\$0': Using ntp server(s) '\$NTPSERVERS'. First working one in list will be used." | tee -a /dev/tty8 NTPCOMMAND="ntpdate -s -b \$NTPSERVERS" else echo -en "\n\$(date +'%F | %T | ')'\$0': Using Debian's default ntp servers." | tee -a /dev/tty8 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git