Added patch from Martin Parm <parmus@diku.dk> to fix the --no-color option. This resolves bug #114156.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@480 67a159dc-881f-0410-a524-ba9dfbe2cb84

ChangeLog

@@ -2,6 +2,11 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
+  gen_funcs.sh:
+  Added patch from Martin Parm <parmus@diku.dk> to fix the --no-color option.
+  This resolves bug #114156.
+
   15 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_bootloader.sh:
   Changed basename to dirname when creating the directory from grub.conf to
   solve bug #161716.

gen_cmdline.sh

@@ -417,12 +417,14 @@ parse_cmdline() {
 		      print_info 2 "CMD_ARCHOVERRIDE: $CMD_ARCHOVERRIDE"
 	      ;;
 	      --color)
-		      CMD_USECOLOR=1
+		      USECOLOR=1
-		      print_info 2 "CMD_USECOLOR: $CMD_USECOLOR"
+		      print_info 2 "USECOLOR: $USECOLOR"
+		      setColorVars
 	      ;;
 	      --no-color)
-		      CMD_USECOLOR=0
+		      USECOLOR=0
-		      print_info 2 "CMD_USECOLOR: $CMD_USECOLOR"
+		      print_info 2 "USECOLOR: $USECOLOR"
+		      setColorVars
 	      ;;
 	      --debugfile=*)
 		      CMD_DEBUGFILE=`parse_opt "$*"`

gen_funcs.sh

@@ -21,6 +21,7 @@ isTrue() {
 	return 1
 }
 
+setColorVars() { 
 if isTrue ${USECOLOR}
 then
 	GOOD=$'\e[32;01m'
@@ -37,6 +38,8 @@ else
 	BOLD=''
 	UNDER=''
 fi
+}
+setColorVars
 
 dump_debugcache() {
 	TODEBUGCACHE=0