This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit cd29267311100676168bec56b53b13381f60e426 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Jan 1 16:12:26 2017 +0100 changed noblank to blank=minutes (0 turns feature off, along with dpms) --- .../lib/live/config/2800-x2go-thinclientconfig | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 76e254f..05051a7 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -119,10 +119,17 @@ else LDAPPARAMS="" fi -if grep -q '\W*noblank\W*' /proc/cmdline; then - # Disable screensaver and DPMS Power Saving if requested - xset s off - xset -dpms +BLANKINGTIME=\$(cat /proc/cmdline | tr ' ' '\n' | awk -F '=' '\$1 == "blank" { print \$2 }') +if [ -n "\$BLANKINGTIME" ]; then + if [ \$BLANKINGTIME -eq 0 ]; then + # Disable screensaver and DPMS Power Saving if requested + xset s off + xset -dpms + else + xset s on + xset s \$BLANKINGTIME + xset +dpms + fi fi x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt \$LDAPPARAMS \$SESSIONFROM -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git