From 6fbe7e6ff8b7d01dc6aa0fe1df9addca2dfe1e40 Mon Sep 17 00:00:00 2001
From: lian <meta.rb@gmail.com>
Date: Tue, 8 Sep 2009 02:56:13 +0200
Subject: [PATCH] fix config_x_startup()

---
 autoconfig.functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoconfig.functions b/autoconfig.functions
index b8579b7..50fdf81 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -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)"
-- 
2.1.4