[X2Go-Commits] [live-build-x2go] 17/58: fixed whitespace detection around cmdline parameters

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/openbox
in repository live-build-x2go.

commit 84bb7158491ba6920ccbbe7a6c7067c9bb0d47f4
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sat Dec 31 20:21:23 2016 +0100

    fixed whitespace detection around cmdline parameters
---
 .../includes.chroot/lib/live/config/2100-lockuser  |    2 +-
 .../lib/live/config/2800-x2go-thinclientconfig     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2100-lockuser b/config/includes.chroot/lib/live/config/2100-lockuser
index 7f89531..1cbcc15 100755
--- a/config/includes.chroot/lib/live/config/2100-lockuser
+++ b/config/includes.chroot/lib/live/config/2100-lockuser
@@ -10,7 +10,7 @@ echo -n " lockuser"
 
 # Set password
 #
-if grep -q " *nouser *" /proc/cmdline ; then
+if grep -q "\W*nouser\W*" /proc/cmdline ; then
 	passwd -l user >/dev/null
 fi
 
diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
index a697138..76e254f 100755
--- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
+++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig
@@ -119,7 +119,7 @@ else
 	LDAPPARAMS=""
 fi
 
-if grep -q '\Wnoblank\W' /proc/cmdline; then
+if grep -q '\W*noblank\W*' /proc/cmdline; then
 	# Disable screensaver and DPMS Power Saving if requested
 	xset s off
 	xset -dpms

--
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