[X2Go-Commits] [live-build-x2go] 23/38: changed blank/nodpms parameters
git-admin at x2go.org
git-admin at x2go.org
Fri Apr 28 11:56:49 CEST 2017
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 dfe4ddbc5511a4ba756be0e2ecd7425159ec1eaa
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date: Sun Jan 1 20:21:30 2017 +0100
changed blank/nodpms parameters
---
.../lib/live/config/2800-x2go-thinclientconfig | 13 +++++++++----
1 file changed, 9 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 05051a7..acd072c 100755
--- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
@@ -121,14 +121,19 @@ fi
BLANKINGTIME=\$(cat /proc/cmdline | tr ' ' '\n' | awk -F '=' '\$1 == "blank" { print \$2 }')
if [ -n "\$BLANKINGTIME" ]; then
- if [ \$BLANKINGTIME -eq 0 ]; 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
# Disable screensaver and DPMS Power Saving if requested
xset s off
- xset -dpms
+ if ! grep -q '\W*nodpms\W*' /proc/cmdline; then
+ xset -dpms
+ fi
else
xset s on
- xset s \$BLANKINGTIME
- xset +dpms
+ xset s \${DPMSARR[0]}
+ if ! grep -q '\W*nodpms\W*' /proc/cmdline; then
+ xset +dpms \${DPMSARR[0]} \${DPMSARR[1]} \${DPMSARR[2]}
+ fi
fi
fi
--
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
More information about the x2go-commits
mailing list