[patch] Patch implements the described enhancements.

genkernel-3.4.10.907-options-to-genkernel-conf.patch (text/plain), 21.69 KB, created by John R. Graham on 2010-05-16 21:49:51 UTC

Index: genkernel.8
===================================================================
--- genkernel.8	(.../3.4.10.907)	(revision 969)
+++ genkernel.8	(.../3.4.10.907-jrg-mod2)	(revision 969)
@@ -65,17 +65,19 @@
 .TP
 \fB\-\-\fR[no\-]\fBmenuconfig\fR
 Runs, or does not run "make menuconfig" after running "make oldconfig".
+Note that the --no-menuconfig also disables any command line or config file
+selected --gconfig or --xconfig directive.
+.TP
+\fB\-\-gconfig\fR
+Run "make gconfig" after running "make oldconfig".
+.TP
+\fB\-\-xconfig\fR
+Run "make xconfig" after running "make oldconfig".
 .TP
 \fB\-\-\fR[no\-]\fBsave\-config\fR
 Saves, or does not save the kernel configuration to
 .I /etc/kernels
 if the kernel is successfully compiled.
-.TP
-\fB\-\-gconfig\fR
-Run "make gconfig" after "make oldconfig".
-.TP
-\fB\-\-xconfig\fR
-Run "make xconfig" after "make oldconfig".
 .PP
 .BR Kernel \ Compilation
 .TP
@@ -207,6 +209,10 @@
 \fB\-\-static\fR
 This builds a monolithic kernel without any modules on any initial ramdisks.
 .TP
+\fB\-\-\fR[no\-]\fBgenzimage\fR
+Builds, or does not build the zImage.initrd for the powerpc arch.  This option
+is currently not supported for any arch other than powerpc.
+.TP
 \fB\-\-linuxrc=\fR<file>
 Use <file> for the linuxrc instead of the genkernel linuxrc.
 .PP
Index: gen_compile.sh
===================================================================
--- gen_compile.sh	(.../3.4.10.907)	(revision 969)
+++ gen_compile.sh	(.../3.4.10.907-jrg-mod2)	(revision 969)
@@ -249,7 +249,7 @@
 	# ARGS='CC="ccache gcc"'
 	if [ "${argstype}" == 'runtask' ]
 	then
-		print_info 2 "COMMAND: ${MAKE} ${MAKEOPTS/-j?/j1} ${ARGS} ${target} $*" 1 0 1
+		print_info 2 "COMMAND: ${MAKE} ${MAKEOPTS/-j?/-j1} ${ARGS} ${target} $*" 1 0 1
 		eval ${MAKE} -s ${MAKEOPTS/-j?/-j1} "${ARGS}" ${target} $*
 		RET=$?
 	elif [ "${LOGLEVEL}" -gt "1" ]
@@ -307,7 +307,7 @@
 		gen_die "Cannot locate kernel binary"
 	fi
 
-	if ! isTrue "${CMD_NOINSTALL}"
+	if ! isTrue "${NOINSTALL}"
 	then
 		copy_image_with_preserve "kernel" \
 			"${tmp_kernel_binary}" \
Index: gen_package.sh
===================================================================
--- gen_package.sh	(.../3.4.10.907)	(revision 969)
+++ gen_package.sh	(.../3.4.10.907-jrg-mod2)	(revision 969)
@@ -164,10 +164,9 @@
 	else
 		if [ -e "${KERNCACHE}" ] 
 		then
-			KERNEL_CONFIG="/${KERNEL_DIR}/.config"
-			if [ "${CMD_KERNEL_CONFIG}" != '' ]
+			if [ -z "${KERNEL_CONFIG}" ]
 			then
-				KERNEL_CONFIG="${CMD_KERNEL_CONFIG}"
+				KERNEL_CONFIG="/${KERNEL_DIR}/.config"
 			fi
 
 			/bin/tar -xj -f ${KERNCACHE} -C ${TEMP}
Index: gen_configkernel.sh
===================================================================
--- gen_configkernel.sh	(.../3.4.10.907)	(revision 969)
+++ gen_configkernel.sh	(.../3.4.10.907-jrg-mod2)	(revision 969)
@@ -2,10 +2,9 @@
 # $Id: 8c00f8d5e158ee319351226cb69dc25d851adedc $
 
 determine_config_file() {
-	if [ "${CMD_KERNEL_CONFIG}" != "" ]
+	if [ -z "${KERNEL_CONFIG}" ]
 	then
-		KERNEL_CONFIG="${CMD_KERNEL_CONFIG}"
-	elif [ -f "/etc/kernels/kernel-config-${ARCH}-${KV}" ]
+		if [ -f "/etc/kernels/kernel-config-${ARCH}-${KV}" ]
 	then
 		KERNEL_CONFIG="/etc/kernels/kernel-config-${ARCH}-${KV}"
 	elif [ -f "${GK_SHARE}/arch/${ARCH}/kernel-config-${KV}" ]
@@ -23,6 +22,7 @@
 	else
 		gen_die 'Error: No kernel .config specified, or file not found!'
 	fi
+	fi
 }
 
 config_kernel() {
@@ -58,25 +58,11 @@
 		print_info 1 "config: --no-clean is enabled; leaving the .config alone."
 	fi
 	
-	if isTrue ${MENUCONFIG}
-	then
-		print_info 1 'config: >> Invoking menuconfig...'
-		compile_generic menuconfig runtask
-		[ "$?" ] || gen_die 'Error: menuconfig failed!'
-	elif isTrue ${CMD_GCONFIG}
-	then
-		print_info 1 'config: >> Invoking gconfig...'
-		compile_generic gconfig kernel
-		[ "$?" ] || gen_die 'Error: gconfig failed!'
-
-		CMD_XCONFIG=0
-	fi
-
-	if isTrue ${CMD_XCONFIG}
+	if [ "${MENUCONFIG}" != 'no' ]
 	then
-		print_info 1 'config: >> Invoking xconfig...'
-		compile_generic xconfig kernel
-		[ "$?" ] || gen_die 'Error: xconfig failed!'
+		print_info 1 'config: >> Invoking ${MENUCONFIG}...'
+		compile_generic ${MENUCONFIG} runtask
+		[ "$?" ] || gen_die 'Error: ${MENUCONFIG} failed!'
 	fi
 
 	# Force this on if we are using --genzimage
Index: genkernel
===================================================================
--- genkernel	(.../3.4.10.907)	(revision 969)
+++ genkernel	(.../3.4.10.907-jrg-mod2)	(revision 969)
@@ -46,8 +46,6 @@
 source ${GK_SHARE}/gen_package.sh || gen_die "Could not read ${GK_SHARE}/gen_package.sh"
 source ${GK_SHARE}/gen_bootloader.sh || gen_die "Could not read ${GK_SHARE}/gen_bootloader.sh"
 
-TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$
-
 trap_cleanup(){
 	# Call exit code of 1 for failure
 	cleanup
@@ -131,7 +129,7 @@
 NORMAL=${BOLD} print_info 1 "Linux Kernel ${BOLD}${KV}${NORMAL} for ${BOLD}${ARCH}${NORMAL}..."
 
 # Check BOOTDIR is mounted
-if isTrue ${CMD_NOINSTALL}
+if isTrue ${NOINSTALL}
 then
 	isTrue ${MOUNTBOOT} && print_info 2 'Skipping automatic mount of boot'
 else
@@ -230,7 +228,7 @@
 	fi
 fi
 
-if ! isTrue "${CMD_NOINSTALL}"
+if ! isTrue "${NOINSTALL}"
 then
 	if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ] 
 	then
@@ -245,10 +243,10 @@
 fi
 
 # Run callback
-if [ "${CMD_CALLBACK}" != "" ]
+if [ "${CALLBACK}" != "" ]
 then
 	print_info 1 "" 1 0
-	print_info 1 "Preparing to run callback: \"${CMD_CALLBACK}\"" 0
+	print_info 1 "Preparing to run callback: \"${CALLBACK}\"" 0
 
 	CALLBACK_ESCAPE=0
 	CALLBACK_COUNT=0
@@ -264,7 +262,7 @@
 	then
 		echo
 		echo
-		eval ${CMD_CALLBACK} | tee -a ${LOGFILE}
+		eval ${CALLBACK} | tee -a ${LOGFILE}
 		CMD_STATUS="${PIPESTATUS[0]}"
 		echo
 		print_info 1 "<<< Callback exit status: ${CMD_STATUS}"
@@ -313,7 +311,7 @@
 
 if [ "${BUILD_KERNEL}" -eq '1' ]
 then
-	if ! isTrue "${CMD_NOINSTALL}"
+	if ! isTrue "${NOINSTALL}"
 	then
 		set_bootloader
 	fi
Index: gen_cmdline.sh
===================================================================
--- gen_cmdline.sh	(.../3.4.10.907)	(revision 969)
+++ gen_cmdline.sh	(.../3.4.10.907-jrg-mod2)	(revision 969)
@@ -44,7 +44,9 @@
   echo "	--all-ramdisk-modules	Copy all kernel modules to the ramdisk"
   echo "	--callback=<...>	Run the specified arguments after the"
   echo "				kernel and modules have been compiled"
-  echo "	--static		Build a static (monolithic kernel)."
+  echo "	--static		Build a static (monolithic kernel)"
+  echo "    --genzimage		Build zImage.initrd for PowerPC arch"
+  echo "    --no-genzimage		Do not build zImage.initrd"
   echo "  Kernel settings"
   echo "	--kerneldir=<dir>	Location of the kernel sources"
   echo "	--kernel-config=<file>	Kernel configuration file to use for compilation"
@@ -92,6 +94,7 @@
   echo "	--busybox-config=<file>	Specifies a user created busybox config"
   echo "	--disklabel		Include disk label and uuid support in your"
   echo "				ramdisk"
+  echo "	--no-disklabel		Do not include disk label and uuid support"
   echo "	--luks			Include LUKS support"
   echo "				--> 'emerge cryptsetup-luks' with USE=-dynamic"
   echo "	--no-busybox    Do not include busybox in the initramfs."
@@ -151,6 +154,57 @@
   echo '	genkernel --help'
 }
 
+#
+# Notes on adding command line options:
+#
+# To allow all command line options to (a) have a genkernel or architecture-specific
+# default defined in a consistent location, (b) have a site default defined in
+# "/etc/genkernel.conf", and (c) override these other two settings on the command
+# line, please follow the following coding guidelines when adding command line
+# options:
+#
+# Step 1:
+#     For boolean command line options (for example --foo),
+#         * Set up both a --foo and --no-foo case below.
+#         * Set the CMD_FOO variable to 1 in the --foo case and 0 in the
+#           --no-foo case.
+#    
+#     For parametric command line options (for example --foo=bar),
+#         * Set up both a --foo and --no-foo case below.
+#         * Just set the CMD_FOO variable appropriately.  In most cases,
+#           use `parse_opt "$*"`.
+#
+#     Include a logging call to the print_info function.
+#    
+# Step 2:
+#     Add a call to the set_config_with_override() function in the
+#     determine_real_args() function in "gen_determineargs.sh".  It should look
+#     something like this:
+#
+#         set_config_with_override <type> FOO CMD_FOO "<default>"
+#
+#     <type> should be 1 for boolean command line options and 2 for parametric
+#     command line options.
+#
+#     "<default>" can either be blank (if there's no default), a constant (if
+#     there's a fixed default), or a calculated architecture specific value.
+#
+# Step 3:
+#     Later on in the determine_real_args() function, run any code that needs
+#     to be run based on the value of your command line option or its default
+#     value.  Putting it there makes sure that it's run against all sources
+#     of the argument value.
+#
+# Step 4:
+#     Document your new command in the longusage() function and in the man
+#     page source.  It's probably also a good idea to include a commented out 
+#     example of the site default in genkernel.conf.
+#
+# Note that these are just guidelines; you will see some well thought out
+# exceptions coded below.
+#
+# - JRG
+
 parse_cmdline() {
 	case "$*" in
 		--kernel-cc=*)
@@ -197,7 +251,7 @@
 			;;
 		--utils-arch=*)
 			CMD_UTILS_ARCH=`parse_opt "$*"`
-			print_info 2 "CMD_UTILS_ARCH: ${CMD_ARCHOVERRIDE}"
+			print_info 2 "CMD_UTILS_ARCH: ${CMD_UTILS_ARCH}"
 			;;
 		--makeopts=*)
 			CMD_MAKEOPTS=`parse_opt "$*"`
@@ -298,32 +352,26 @@
 			;;
 		--loglevel=*)
 			CMD_LOGLEVEL=`parse_opt "$*"`
+			# Exception:  Set the log file immediately so that it provides
+			# the most comrehensive trace. - JRG
 			LOGLEVEL="${CMD_LOGLEVEL}"
 			print_info 2 "CMD_LOGLEVEL: ${CMD_LOGLEVEL}"
 			;;
 		--menuconfig)
-			TERM_LINES=`stty -a | head -n 1 | cut -d\  -f5 | cut -d\; -f1`
-			TERM_COLUMNS=`stty -a | head -n 1 | cut -d\  -f7 | cut -d\; -f1`
-			if [[ TERM_LINES -lt 19 || TERM_COLUMNS -lt 80 ]]
-			then
-				echo "Error: You need a terminal with at least 80 columns"
-				echo "		 and 19 lines for --menuconfig; try --nomenuconfig..."
-				exit 1
-			fi
-			CMD_MENUCONFIG=1
-			print_info 2 "CMD_MENUCONFIG: ${CMD_MENUCONFIG}"
+			CMD_MENUCONFIG="menuconfig"
+			print_info 2 "CMD_KERNEL_CONFIG: ${CMD_KERNEL_CONFIG}"
 			;;
 		--no-menuconfig)
-			CMD_MENUCONFIG=0
-			print_info 2 "CMD_MENUCONFIG: ${CMD_MENUCONFIG}"
+			CMD_MENUCONFIG="no"
+			print_info 2 "CMD_KERNEL_CONFIG: ${CMD_KERNEL_CONFIG}"
 			;;
 		--gconfig)
-			CMD_GCONFIG=1
-			print_info 2 "CMD_GCONFIG: ${CMD_GCONFIG}"
+			CMD_MENUCONFIG="gconfig"
+			print_info 2 "CMD_KERNEL_CONFIG: ${CMD_KERNEL_CONFIG}"
 			;;
 		--xconfig)
-			CMD_XCONFIG=1
-			print_info 2 "CMD_XCONFIG: ${CMD_XCONFIG}"
+			CMD_MENUCONFIG="xconfig"
+			print_info 2 "CMD_KERNEL_CONFIG: ${CMD_KERNEL_CONFIG}"
 			;;
 		--save-config)
 			CMD_SAVE_CONFIG=1
@@ -357,28 +405,28 @@
 			;;
 		--gensplash=*)
 			CMD_SPLASH=1
-			SPLASH_THEME=`parse_opt "$*"`
+			CMD_SPLASH_THEME=`parse_opt "$*"`
 			print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
-			print_info 2 "SPLASH_THEME: ${SPLASH_THEME}"
+			print_info 2 "CMD_SPLASH_THEME: ${CMD_SPLASH_THEME}"
 			echo
 			print_warning 1 "Please use --splash, as --gensplash is deprecated."
 			;;
 		--gensplash)
 			CMD_SPLASH=1
-			SPLASH_THEME='default'
+			CMD_SPLASH_THEME='default'
 			print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
 			echo
 			print_warning 1 "Please use --splash, as --gensplash is deprecated."
 			;;
 		--splash=*)
 			CMD_SPLASH=1
-			SPLASH_THEME=`parse_opt "$*"`
+			CMD_SPLASH_THEME=`parse_opt "$*"`
 			print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
-			print_info 2 "SPLASH_THEME: ${SPLASH_THEME}"
+			print_info 2 "CMD_SPLASH_THEME: ${CMD_SPLASH_THEME}"
 			;;
 		--splash)
 			CMD_SPLASH=1
-			SPLASH_THEME='default'
+			CMD_SPLASH_THEME='default'
 			print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
 			;;
 		--no-splash)
@@ -386,14 +434,14 @@
 			print_info 2 "CMD_SPLASH: ${CMD_SPLASH}"
 			;;
 		--gensplash-res=*)
-			SPLASH_RES=`parse_opt "$*"`
-			print_info 2 "SPLASH_RES: ${SPLASH_RES}"
+			CMD_SPLASH_RES=`parse_opt "$*"`
+			print_info 2 "CMD_SPLASH_RES: ${CMD_SPLASH_RES}"
 			echo
 			print_warning 1 "Please use --splash-res, as --gensplash-res is deprecated."
 			;;
 		--splash-res=*)
-			SPLASH_RES=`parse_opt "$*"`
-			print_info 2 "SPLASH_RES: ${SPLASH_RES}"
+			CMD_SPLASH_RES=`parse_opt "$*"`
+			print_info 2 "CMD_SPLASH_RES: ${CMD_SPLASH_RES}"
 			;;
 		--install)
 			CMD_NOINSTALL=0
@@ -413,41 +461,42 @@
 			;;
 		--callback=*)
 			CMD_CALLBACK=`parse_opt "$*"`
-			print_info 2 "CMD_CALLBACK: ${CMD_CALLBACK}/$*"
+			print_info 2 "CMD_CALLBACK: ${CMD_CALLBACK}"
 			;;
 		--static)
 			CMD_STATIC=1
 			print_info 2 "CMD_STATIC: ${CMD_STATIC}"
 			;;
 		--tempdir=*)
-			TMPDIR=`parse_opt "$*"`
-			TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$
-			print_info 2 "TMPDIR: ${TMPDIR}"
-			print_info 2 "TEMP: ${TEMP}"
+			CMD_TMPDIR=`parse_opt "$*"`
+			print_info 2 "CMD_TMPDIR: ${CMD_TMPDIR}"
 			;; 
 		--postclear)
 			CMD_POSTCLEAR=1
 			print_info 2 "CMD_POSTCLEAR: ${CMD_POSTCLEAR}"
 			;; 
 		--arch-override=*)
-			CMD_ARCHOVERRIDE=`parse_opt "$*"`
-			print_info 2 "CMD_ARCHOVERRIDE: ${CMD_ARCHOVERRIDE}"
+			CMD_ARCH_OVERRIDE=`parse_opt "$*"`
+			print_info 2 "CMD_ARCH_OVERRIDE: ${CMD_ARCH_OVERRIDE}"
 			;;
 		--color)
-			USECOLOR=1
-			print_info 2 "USECOLOR: ${USECOLOR}"
+			CMD_USECOLOR=1
+			print_info 2 "CMD_USECOLOR: ${CMD_USECOLOR}"
+			USECOLOR="${CMD_USECOLOR}"
 			setColorVars
 			;;
 		--no-color)
-			USECOLOR=0
-			print_info 2 "USECOLOR: ${USECOLOR}"
+			CMD_USECOLOR=0
+			print_info 2 "CMD_USECOLOR: ${CMD_USECOLOR}"
+			USECOLOR="${CMD_USECOLOR}"
 			setColorVars
 			;;
 		--logfile=*)
 			CMD_LOGFILE=`parse_opt "$*"`
-			LOGFILE=`parse_opt "$*"`
+			# Exception:  Set the log file immediately so that it provides
+			# the most comrehensive trace. - JRG
+			LOGFILE="${CMD_LOGFILE}"
 			print_info 2 "CMD_LOGFILE: ${CMD_LOGFILE}"
-			print_info 2 "LOGFILE: ${CMD_LOGFILE}"
 			;;
 		--kerneldir=*)
 			CMD_KERNEL_DIR=`parse_opt "$*"`
@@ -506,16 +555,21 @@
 			print_info 2 "CMD_BUSYBOX_CONFIG: ${CMD_BUSYBOX_CONFIG}"
 			;;
 		--genzimage)
-			KERNEL_MAKE_DIRECTIVE_2='zImage.initrd'
-			KERNEL_BINARY_2='arch/powerpc/boot/zImage.initrd'
-			CMD_GENZIMAGE="yes"
-#			ENABLE_PEGASOS_HACKS="yes"
-#			print_info 2 "ENABLE_PEGASOS_HACKS: ${ENABLE_PEGASOS_HACKS}"
+			CMD_GENZIMAGE=1
+			print_info 2 "CMD_GENZIMAGE: ${CMD_GENZIMAGE}"
+			;;
+		--no-genzimage)
+			CMD_GENZIMAGE=0
+			print_info 2 "CMD_GENZIMAGE: ${CMD_GENZIMAGE}"
 			;;
 		--disklabel)
 			CMD_DISKLABEL=1
 			print_info 2 "CMD_DISKLABEL: ${CMD_DISKLABEL}"
 			;;
+		--no-disklabel)
+			CMD_DISKLABEL=0
+			print_info 2 "CMD_DISKLABEL: ${CMD_DISKLABEL}"
+			;;
 		--luks)
 			CMD_LUKS=1
 			print_info 2 "CMD_LUKS: ${CMD_LUKS}"
Index: gen_arch.sh
===================================================================
--- gen_arch.sh	(.../3.4.10.907)	(revision 969)
+++ gen_arch.sh	(.../3.4.10.907-jrg-mod2)	(revision 969)
@@ -2,13 +2,9 @@
 # $Id: 079edb21862dc209449422bfa43d9105a1a2b646 $
 
 get_official_arch() {
-	if [ "${CMD_ARCHOVERRIDE}" != '' ]
-	then
-		ARCH=${CMD_ARCHOVERRIDE}
-	else
 		if [ "${ARCH_OVERRIDE}" != '' ]
 		then
-			ARCH=${ARCH_OVERRIDE}
+		ARCH="${ARCH_OVERRIDE}"
 		else
 			ARCH=`uname -m`
 			case "${ARCH}" in
@@ -25,17 +21,6 @@
 					;;
 			esac
 		fi
-	fi
-
-	if [ "${CMD_UTILS_ARCH}" != '' ]
-	then
-		UTILS_ARCH=${CMD_UTILS_ARCH}
-	else
-		if [ "${UTILS_ARCH}" != '' ]
-		then
-			UTILS_ARCH=${UTILS_ARCH}
-		fi
-	fi
 
 	# sparc64 klibc is b0rked, so we force to 32
 	if [ "${ARCH}" = 'sparc64' ]
Index: gen_determineargs.sh
===================================================================
--- gen_determineargs.sh	(.../3.4.10.907)	(revision 969)
+++ gen_determineargs.sh	(.../3.4.10.907-jrg-mod2)	(revision 969)
@@ -63,7 +63,8 @@
 
 	#                          Config File          Command Line             Arch Default
 	#                          -----------          ------------             ------------
-	set_config_with_override 2 DEBUGFILE            CMD_DEBUGFILE
+	set_config_with_override 2 LOGFILE              CMD_LOGFILE
+	set_config_with_override 2 LOGLEVEL             CMD_LOGLEVEL             "1"
 	set_config_with_override 2 KERNEL_DIR           CMD_KERNEL_DIR           "${DEFAULT_KERNEL_SOURCE}"
 	set_config_with_override 1 NO_KERNEL_SOURCES    CMD_NO_KERNEL_SOURCES
 	set_config_with_override 2 KNAME                CMD_KERNNAME             "genkernel"
@@ -83,9 +84,11 @@
 	set_config_with_override 2 BOOTDIR              CMD_BOOTDIR              "/boot"
 
 	set_config_with_override 1 SPLASH               CMD_SPLASH
+	set_config_with_override 2 SPLASH_THEME         CMD_SPLASH_THEME         "default"
+	set_config_with_override 2 SPLASH_RES           CMD_SPLASH_RES           "1024x768"
 	set_config_with_override 1 POSTCLEAR            CMD_POSTCLEAR
 	set_config_with_override 1 MRPROPER             CMD_MRPROPER
-	set_config_with_override 1 MENUCONFIG           CMD_MENUCONFIG
+	set_config_with_override 2 MENUCONFIG           CMD_MENUCONFIG           "no"
 	set_config_with_override 1 CLEAN                CMD_CLEAN
 
 	set_config_with_override 2 MINKERNPACKAGE       CMD_MINKERNPACKAGE
@@ -121,6 +124,16 @@
 	set_config_with_override 1 DOKEYMAPAUTO         CMD_DOKEYMAPAUTO
 	set_config_with_override 2 BUSYBOX_CONFIG       CMD_BUSYBOX_CONFIG
 
+	set_config_with_override 2 ARCH_OVERRIDE        CMD_ARCH_OVERRIDE
+	set_config_with_override 2 CALLBACK             CMD_CALLBACK
+	set_config_with_override 1 USECOLOR             CMD_USECOLOR             "yes"
+	set_config_with_override 2 KERNEL_CONFIG        CMD_KERNEL_CONFIG
+	set_config_with_override 2 LINUXRC              CMD_LINUXRC
+	set_config_with_override 1 NOINSTALL            CMD_MOINSTALL
+	set_config_with_override 1 SLOWUSB              CMD_SLOWUSB
+	set_config_with_override 2 UTILS_ARCH           CMD_UTILS_ARCH
+	set_config_with_override 2 TMPDIR               CMD_TMPDIR               "/var/tmp/genkernel"
+
 	BOOTDIR=`arch_replace "${BOOTDIR}"`
 	BOOTDIR=${BOOTDIR%/}    # Remove any trailing slash
 
@@ -145,6 +158,8 @@
 	FUSE_BINCACHE=`arch_replace "${FUSE_BINCACHE}"`
 	UNIONFS_FUSE_BINCACHE=`arch_replace "${UNIONFS_FUSE_BINCACHE}"`
 
+	TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$
+
 	if [ -n "${CMD_BOOTLOADER}" ]
 	then
 		BOOTLOADER="${CMD_BOOTLOADER}"
@@ -210,5 +225,49 @@
 		INTEGRATED_INITRAMFS=0
 	fi
 	
+	if isTrue "$USECOLOR"
+	then
+		print_info 5 "  USECOLOR was on.  Setting color variables."
+		setColorVars
+	fi
+
+	# Default old true value to "menuconfig".
+	if isTrue "${MENUCONFIG}"
+	then
+		MENUCONFIG="menuconfig"
+	fi
+
+	case "${MENUCONFIG}" in
+		menuconfig)
+			TERM_LINES=`stty -a | head -n 1 | cut -d\  -f5 | cut -d\; -f1`
+			TERM_COLUMNS=`stty -a | head -n 1 | cut -d\  -f7 | cut -d\; -f1`
+			if [[ TERM_LINES -lt 19 || TERM_COLUMNS -lt 80 ]]
+			then
+				echo "Error: You need a terminal with at least 80 columns"
+				echo "		 and 19 lines for --menuconfig; try --nomenuconfig..."
+				exit 1
+			fi
+			;;
+		[gx]config)
+			;;
+
+		[Ff][Aa][Ll][Ss][Ee]|[Ff]|[Nn][Oo]|0)
+			MENUCONFIG="no"
+			;;
+		*)
+			gen_die "Illegal MENUCONFIG value \"${MENUCONFIG}\", probably in genkernel.conf."
+			;;
+	esac
+
+	if isTrue ${GENZIMAGE}
+	then
+		if [ "${ARCH}" != 'powerpc' ]
+		then
+			gen_die "Error: --genzimage option only supported on powerpc arch!"
+		fi
+		KERNEL_MAKE_DIRECTIVE_2='zImage.initrd'
+		KERNEL_BINARY_2='arch/powerpc/boot/zImage.initrd'
+	fi
+
 	get_KV
 }
Index: genkernel.conf
===================================================================
--- genkernel.conf	(.../3.4.10.907)	(revision 969)
+++ genkernel.conf	(.../3.4.10.907-jrg-mod2)	(revision 969)
@@ -11,7 +11,10 @@
 # Run 'make oldconfig' before compiling this kernel?
 OLDCONFIG="yes"
 
-# Run 'make menuconfig' before compiling this kernel?
+# Run 'make menuconfig/gconfig/xconfig' before compiling this kernel?
+# Use menuconfig, gconfig, xconfig, or no.  For backwards compatibility, 
+# the true values are equivalent to "menuconfig" and the false values are all
+# equivalent to "no".
 MENUCONFIG="no"
 
 # Run 'make clean' before compilation?
@@ -39,6 +42,15 @@
 # Use Color output in Genkernel?
 USECOLOR="yes"
 
+# Install framebuffer splash support into initramfs?
+# SPLASH="no"
+
+# Set framebuffer splash theme.
+# SPLASH_THEME="default"
+
+# Select splash theme resolutions to install.
+# SPLASH_RES="1024x768"
+
 # Clear build cache dir
 # CLEAR_CACHE_DIR="yes"
 
@@ -86,6 +98,22 @@
 # Add new kernel to grub?
 # BOOTLOADER="grub"
 
+# Run the specified callback command after the kernel and modules have been
+# compiled.
+# CALLBACK=""
+
+# Kernel configuration file to use for compilation.
+# KERNEL_CONFIG=""
+
+# Specifies a user created linuxrc
+# LINUXRC=""
+
+# Enables extra pauses for slow USB CD boots
+# SLOWUSB="no"
+
+# Force to arch for utils only instead of autodetect.
+# UTILS_ARCH=""
+
 # =========Low Level Compile Settings=========
 #
 # GNU Make to use for kernel.  See also the --kernel-make command line option.
Index: gen_initramfs.sh
===================================================================
--- gen_initramfs.sh	(.../3.4.10.907)	(revision 969)
+++ gen_initramfs.sh	(.../3.4.10.907-jrg-mod2)	(revision 969)
@@ -504,10 +504,10 @@
 	fi
 	mkdir -p "${TEMP}/initramfs-aux-temp/etc"	
 	mkdir -p "${TEMP}/initramfs-aux-temp/sbin"	
-	if [ -f "${CMD_LINUXRC}" ]
+	if [ -f "${LINUXRC}" ]
 	then
-		cp "${CMD_LINUXRC}" "${TEMP}/initramfs-aux-temp/init"
-		print_info 2 "        >> Copying user specified linuxrc: ${CMD_LINUXRC} to init"
+		cp "${LINUXRC}" "${TEMP}/initramfs-aux-temp/init"
+		print_info 2 "        >> Copying user specified linuxrc: ${LINUXRC} to init"
 	else	
 		if isTrue ${NETBOOT}
 		then
@@ -572,7 +572,7 @@
 		mkdir -p "${TEMP}/initramfs-aux-temp/lib/keymaps"
 		/bin/tar -C "${TEMP}/initramfs-aux-temp/lib/keymaps" -zxf "${GK_SHARE}/defaults/keymaps.tar.gz"
 	fi
-	if isTrue $CMD_SLOWUSB
+	if isTrue $SLOWUSB
 	then
 		echo 'MY_HWOPTS="${MY_HWOPTS} slowusb"' >> ${TEMP}/initramfs-aux-temp/etc/initrd.defaults
 	fi