fix config_x_startup()

[grml-autoconfig.git] / autoconfig.functions

diff --git a/autoconfig.functions b/autoconfig.functions
index d90e051..50fdf81 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -60,7 +60,7 @@ getbootparam(){
 
 # Check boot commandline for specified option
 checkbootparam(){
-  [ -n "$1" ] || { echo "Error: missing argument to checkbootparam()" ; return 1 }
+  [ -n "$1" ] || ( echo "Error: missing argument to checkbootparam()" ; return 1 )
   # make sure we match beginning and end of line as well
   # but don't match 'vg' if we want to check for 'vga'
   if echo "$CMDLINE" | grep -qw "$1" ; then
@@ -1850,7 +1850,7 @@ create_mnt_dirs(){
 config_x_startup(){
 # make sure we start X only if startx is used *before* a nostartx option
 # so it's possible to disable automatic X startup using nostart
-if checkbootparam 'startx' && ! grep -q 'startx.*nostartx' "$CMDLINE" ; then
+if checkbootparam 'startx' && ! echo "$CMDLINE" | grep -q 'startx.*nostartx' ; then
  if [ -x /usr/X11R6/bin/X ] ; then
   if [ -z "$INSTALLED" ] ; then
    WINDOWMANAGER="$(getbootparam 'startx' 2>>$DEBUG)"