From a8b01f062d0808f300308e9232b60097363d9f4d Mon Sep 17 00:00:00 2001
From: Tim Yamin <plasmaroo@gentoo.org>
Date: Sun, 21 Mar 2004 16:20:26 +0000
Subject: [PATCH] Version bump. Closes bugs #34948, #37371, #41129, #41166,
 #42725, #42815, #44127, #44556, and #44601.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@98 67a159dc-881f-0410-a524-ba9dfbe2cb84
---
 README                  |  86 ++++-----
 TODO                    |   8 +-
 gen_cmdline.sh          | 391 ++++++++++++++++++++++------------------
 gen_compile.sh          | 121 +++++++------
 gen_configkernel.sh     |  47 +++--
 gen_determineargs.sh    |   6 +-
 gen_funcs.sh            |  63 +++++--
 gen_initrd.sh           |  73 +++++---
 generic/initrd.defaults |  16 +-
 generic/initrd.scripts  |  15 +-
 generic/keymaps.tar.gz  | Bin 0 -> 17487 bytes
 generic/linuxrc         | 132 +++++++-------
 generic/modprobe        |  43 ++---
 genkernel               | 118 +++++++++---
 genkernel.conf          |  13 +-
 x86/modules_load        |   4 -
 16 files changed, 639 insertions(+), 497 deletions(-)
 create mode 100644 generic/keymaps.tar.gz

diff --git a/README b/README
index 1032972..4ae8d6d 100644
--- a/README
+++ b/README
@@ -1,63 +1,45 @@
-VERY EXPERIMENTAL
-seems to work so far on amd64 and x86
-
 DEPENDANCIES:
-- bootsplash
-- gcc/binutils
-- bash
-
-INSTALLATION:
-
-put genkernel.conf in /etc
-
-put genkernel executable in /usr/bin
-
-put the rest of the files and directories in /usr/share/genkernel
-
+  - GCC and binutils
+  - GNU Bash
 
+USAGE:
+  See http://www.gentoo.org/doc/en/genkernel.xml or
+  issue ``genkernel --help''.
 
 PORTING:
+  To port to other arches:
 
-To port to other arches:
-
-cd /usr/share/genkernel
-cp -Rp x86 ${myarch}
-mkdir /usr/share/genkernel/pkg/${myarch}
-
-
-modify what is needed in the /usr/share/genkernel/${myarch}
-directory, this is all the arch-specific stuff, as well
-as a generic kernel-config 
+  # cd /usr/share/genkernel
+  # cp -Rp x86 ${myarch}
+  # mkdir /usr/share/genkernel/pkg/${myarch}
 
+  Modify what is needed in the /usr/share/genkernel/${myarch}
+  directory, as well making a generic kernel-config.
 
 IMPORTANT KERNEL NOTES:
-- You MUST have devfs turned on at this time, but you MUST NOT
-  have "Automatically mount at boot" option turned on. 
-- You MUST have /dev/pts turned on
-- If you want Bootsplash, you MUST have VESAFB enabled for 2.6,
-  other framebuffers won't work.  You MUST also enable
-  "video mode selection support" and "Framebuffer Console support"
-- To build a kernel with GenKernel you must have  
-  "Block devices->Loopback device support"  
-  "Block devices->RAM disk support"
-- To boot genkernel properly, the kernel config must have
-  RAM disk support and Initial RAM disk support.  You should
-  also set your "Default RAM disk size to 8192"
-
+  - You MUST have /dev/pts turned on.
+  - If you want Bootsplash, you MUST have VESAFB enabled for 2.6,
+    other framebuffers won't work.  You MUST also enable
+    "video mode selection support" and "Framebuffer Console support"
+  - To build a kernel with Genkernel you must have  
+    "Block devices->Loopback device support"  
+    "Block devices->RAM disk support"
+  - To boot genkernel properly, the kernel config must have
+    RAM disk support and Initial RAM disk support. You should
+    also set your "Default RAM disk size to 8192"
 
 BOOTING A KERNEL WITH INITRD:
 
-GRUB:
-real_root= needs to point to your root partition
-root=  needs to point to the ramdisk (should stay at /dev/ram0)
-init= needs to point to the linuxrc file to execute on the ramdisk
-vga=  should be the resolution you want your screen at  0x317 indicates
-      1024x768 - 16bpp   and you'll get a pretty bootsplash if configured properly
-
-
-GRUB EXAMPLE ENTRY:
-title=Linux 2.6.0 genkernel
-root (hd0,0)
-kernel (hd0,0)/boot/kernel-2.6.0-gentoo root=/dev/ram0 init=/linuxrc real_root=/dev/hda3 vga=0x317
-initrd (hd0,0)/boot/initrd-2.6.0-gentoo
-
+  GRUB:
+    real_root=	needs to point to your root partition
+    root=	needs to point to the ramdisk (should stay at /dev/ram0)
+    init=	needs to point to the linuxrc file to execute on the ramdisk
+    vga=	should be the resolution you want your screen. 0x317 is
+    		1024x768 - 16bpp and you'll get a pretty bootsplash if
+    		configured properly
+
+  GRUB EXAMPLE ENTRY:
+    title=2.6.0 [ Genkernel ]
+    root (hd0,0)
+    kernel (hd0,0)/boot/kernel-2.6.0-gentoo root=/dev/ram0 init=/linuxrc real_root=/dev/hda3 vga=0x317
+    initrd (hd0,0)/boot/initrd-2.6.0-gentoo
diff --git a/TODO b/TODO
index cbd810a..72291a6 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,4 @@
-- add LVM2 support, so people that have their root partitions
+- Add LVM2 support, so people that have their root partitions
   LVM2-ized can boot.
-- bump busybox version to _pre5 which has initial 2.6 insmod
-  and devfsd support.  Provide configurable options to allow
-  building real devfsd or using busybox devfsd, and likewise
-  for insmod.
-- need configs for other arches
+- Need configs for other currently-unsupported arches.
 
diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 1a42700..3dadab6 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -1,21 +1,27 @@
 #!/bin/bash
 
 usage() {
-  echo "GenKernel ${GK_V} [options] command"
-  echo "Available Commands: "
-  echo "	all			Build all steps"
-  echo "	kernel			Build only kernel and modules (not done yet)"
-  echo "	initrd			Build only initrd (not done yet)"
-  echo ""
+  echo "Gentoo Linux Genkernel ${GK_V}"
+  echo "Usage: "
+  echo "	genkernel [options] action"
+  echo
+  echo "Available Actions: "
+  echo "  all				Build all steps"
+  echo "  kernel			Build only kernel and modules (not done yet)"
+  echo "  initrd			Build only initrd (not done yet)"
+  echo
   echo "Available Options: "
   echo "  Debug settings"
   echo "	--debuglevel=<0-5>	Debug Verbosity Level"
   echo "	--debugfile=<outfile>	Output file for debug info"
   echo "	--color			Output debug in color"
   echo "	--no-color		Do not output debug in color"
+  echo "  Kernel Configuration settings"
+  echo "	--menuconfig		Run menuconfig after oldconfig"
+  echo "	--no-menuconfig		Do not run menuconfig after oldconfig"
+  echo "	--gconfig		Run gconfig after oldconfig"
+  echo "	--xconfig		Run xconfig after oldconfig"
   echo "  Kernel Compile settings"
-  echo "	--menuconfig		Run menu config after oldconfig"
-  echo "	--no-menuconfig		Do no run menu config after oldconfig"
   echo "	--mrproper		Run make mrproper before compilation"
   echo "	--clean			Run make clean before compilation"
   echo "	--no-clean		Do not run make clean before compilation"
@@ -24,33 +30,40 @@ usage() {
   echo "	--no-bootsplash		Do not use bootsplash"
   echo "	--install		Install kernel after building"
   echo "	--no-install		Do not install kernel after building"
-  echo "	--kerneldir=<dir>	Location of kernel source"
+  echo "	--no-initrdmodules	Don't copy any modules to the initrd"
+  echo "	--callback=<...>	Run the specified arguments after"
+  echo "				the kernel and modules have been"
+  echo "				compiled."
+  echo "  Kernel settings"
+  echo "	--kerneldir=<dir>	Location of the kernel sources"
   echo "	--kernel-config=<file>	Kernel configuration file to use for compilation"
-  echo "        --no-initrdmodules      Don't copy modules to initrd" 
- echo "  Low-Level Compile settings"
+  echo "  Low-Level Compile settings"
   echo "	--kernel-cc=<compiler>	Compiler to use for kernel (e.g. distcc)"
-  echo "	--kernel-ld=<linker>	Linker to use for kernel"
   echo "	--kernel-as=<assembler>	Assembler to use for kernel"
+  echo "	--kernel-ld=<linker>	Linker to use for kernel"
   echo "	--kernel-make=<makeprg> GNU Make to use for kernel"
-  echo "	--utils-cc=<compiler>	Compiler to use for utils (e.g. busybox, modutils)"
-  echo "	--utils-ld=<linker>	Linker to use for utils"
+  echo "	--utils-cc=<compiler>	Compiler to use for utilities"
   echo "	--utils-as=<assembler>	Assembler to use for utils"
+  echo "	--utils-ld=<linker>	Linker to use for utils"
   echo "	--utils-make=<makeprog>	GNU Make to use for utils"
-  echo "	--makeopts=<makeopts>	Make Opts such as -j2, etc"
+  echo "	--makeopts=<makeopts>	Make options such as -j2, etc."
+  echo "  Initialization"
+  echo "	--do-keymap-auto	Forces keymap selection at boot."
   echo "  Internals"
-  echo "	--arch-override=<arch>	Force to arch instead of autodetect (cross-compile?)"
+  echo "	--arch-override=<arch>	Force to arch instead of autodetect"
   echo "	--busybox-config=<file>	Busybox configuration file to use"
-  echo "	--busybox-bin=<file>	Don't compile busybox, use this _static_ bzip2'd binary"
-  echo "  Misc Settings"
-  echo "	--max-kernel-size=<k>	Maximum kernel size"
-  echo "	--max-initrd-size=<k>	Maximum initrd size"
-  echo "	--max-kernel-and-initrd-size=<k>	Maximum combined initrd + kernel size"
+  echo "	--busybox-bin=<file>	Don't compile busybox, use this _static_"
+  echo "				bzip2'd binary"
+#  echo "  Misc Settings"
+#  echo "	--max-kernel-size=<k>	Maximum kernel size"
+#  echo "	--max-initrd-size=<k>	Maximum initrd size"
+#  echo "	--max-kernel-and-initrd-size=<k>	Maximum combined initrd + kernel size"
   echo "  Output Settings"
-  echo "        --minkernpackage=<tbz2> File to output a .tar.bz2'd kernel and initrd to."
-  echo "                                These will be renamed to simply 'kernel' and 'initrd'"
-  echo "                                inside the package without any path information."
-  echo "                                No modules outside of the initrd will be included"
-  echo ""
+  echo "        --minkernpackage=<tbz2> File to output a .tar.bz2'd kernel and initrd to"
+  echo "                                These will be renamed to simply 'kernel' and"
+  echo "				'initrd' inside the package without any path"
+  echo "                                information. No modules outside of the initrd"
+  echo "                                will be included."
 }
 
 parse_opt() {
@@ -62,158 +75,178 @@ parse_opt() {
 }
 
 parse_cmdline() {
-	for x in $*
-	do
-		case "${x}" in
-			--kernel-cc*)
-				CMD_KERNEL_CC=`parse_opt "${x}"`
-				print_info 2 "CMD_KERNEL_CC: $CMD_KERNEL_CC"
-			;;
-			--kernel-ld*)
-				CMD_KERNEL_LD=`parse_opt "${x}"`
-				print_info 2 "CMD_KERNEL_LD: $CMD_KERNEL_LD"
-			;;
-			--kernel-as*)
-				CMD_KERNEL_AS=`parse_opt "${x}"`
-				print_info 2 "CMD_KERNEL_AS: $CMD_KERNEL_AS"
-			;;
-			--kernel-make*)
-				CMD_KERNEL_MAKE=`parse_opt "${x}"`
-				print_info 2 "CMD_KERNEL_MAKE: $CMD_KERNEL_MAKE"
-			;;
-			--utils-cc*)
-				CMD_UTILS_CC=`parse_opt "${x}"`
-				print_info 2 "CMD_UTILS_CC: $CMD_UTILS_CC"
-			;;
-			--utils-ld*)
-				CMD_UTILS_LD=`parse_opt "${x}"`
-				print_info 2 "CMD_UTILS_LD: $CMD_UTILS_LD"
-			;;
-			--utils-as*)
-				CMD_UTILS_AS=`parse_opt "${x}"`
-				print_info 2 "CMD_UTILS_AS: $CMD_UTILS_AS"
-			;;
-			--utils-make*)
-				CMD_UTILS_MAKE=`parse_opt "${x}"`
-				print_info 2 "CMD_UTILS_MAKE: $CMD_UTILS_MAKE"
-			;;
-			--makeopts*)
-				CMD_MAKEOPTS=`parse_opt "${x}"`
-				print_info 2 "CMD_MAKEOPTS: $CMD_MAKEOPTS"
-			;;			
-			--debuglevel*)
-				CMD_DEBUGLEVEL=`parse_opt "${x}"`
-				DEBUGLEVEL="${CMD_DEBUGLEVEL}"
-				print_info 2 "CMD_DEBUGLEVEL: $CMD_DEBUGLEVEL"
-			;;
-			--menuconfig)
-				CMD_MENUCONFIG=1
-				print_info 2 "CMD_MENUCONFIG: $CMD_MENUCONFIG"
-			;;
-			--no-menuconfig)
-				CMD_MENUCONFIG=0
-				print_info 2 "CMD_MENUCONFIG: $CMD_MENUCONFIG"
-			;;
-			--mrproper)
-				CMD_MRPROPER=1
-				print_info 2 "CMD_MRPROPER: $CMD_MRPROPER"
-			;;
-			--no-mrproper)
-				CMD_MRPROPER=0
-				print_info 2 "CMD_MRPROPER: $CMD_MRPROPER"
-			;;
-			--clean)
-				CMD_CLEAN=1
-				print_info 2 "CMD_CLEAN: $CMD_CLEAN"
-			;;
-			--no-clean)
-				CMD_CLEAN=0
-				print_info 2 "CMD_CLEAN: $CMD_CLEAN"
-			;;
-			--bootsplash)
-				CMD_BOOTSPLASH=1
-				print_info 2 "CMD_BOOTSPLASH: $CMD_BOOTSPLASH"
-			;;
-			--no-bootsplash)
-				CMD_BOOTSPLASH=0
-				print_info 2 "CMD_BOOTSPLASH: $CMD_BOOTSPLASH"
-			;;
-			--install)
-				CMD_NOINSTALL=0
-				print_info 2 "CMD_NOINSTALL: $CMD_NOINSTALL"
-			;;
-			--no-install)
-				CMD_NOINSTALL=1
-				print_info 2 "CMD_NOINSTALL: $CMD_NOINSTALL"
-			;;
-			--no-initrdmodules)
-				CMD_NOINITRDMODULES=1
-				print_info 2 "CMD_NOINITRDMODULES: $CMD_NOINITRDMODULES"
-			;;
-			--arch-override*)
-				CMD_ARCHOVERRIDE=`parse_opt "${x}"`
-				print_info 2 "CMD_ARCHOVERRIDE: $CMD_ARCHOVERRIDE"
-			;;
-			--color)
-				CMD_USECOLOR=1
-				print_info 2 "CMD_USECOLOR: $CMD_USECOLOR"
-			;;
-			--no-color)
-				CMD_USECOLOR=0
-				print_info 2 "CMD_USECOLOR: $CMD_USECOLOR"
-			;;
-			--debugfile*)
-				CMD_DEBUGFILE=`parse_opt "${x}"`
-				print_info 2 "CMD_DEBUGFILE: $CMD_DEBUGFILE"
-			;;
-			--kerneldir*)
-				CMD_KERNELDIR=`parse_opt "${x}"`
-				print_info 2 "CMD_KERNELDIR: $CMD_KERNELDIR"
-			;;
-			--kernel-config*)
-				CMD_KERNEL_CONFIG=`parse_opt "${x}"`
-				print_info 2 "CMD_KERNEL_CONFIG: $CMD_KERNEL_CONFIG"
-			;;
-			--busybox-config*)
-				CMD_BUSYBOX_CONFIG=`parse_opt "${x}"`
-				print_info 2 "CMD_BUSYBOX_CONFIG: $CMD_BUSYBOX_CONFIG"
-			;;
-			--busybox-bin*)
-				CMD_BUSYBOX_BIN=`parse_opt "${x}"`
-				print_info 2 "CMD_BUSYBOX_BIN: $CMD_BUSYBOX_BIN"
-			;;
-			--max-kernel-size*)
-				CMD_MAX_KERNEL_SIZE=`parse_opt "${x}"`
-				print_info 2 "MAX_KERNEL_SIZE: $CMD_MAX_KERNEL_SIZE"
-			;;
-			--max-initrd-size*)
-				CMD_MAX_INITRD_SIZE=`parse_opt "${x}"`
-				print_info 2 "MAX_INITRD_SIZE: $CMD_MAX_INITRD_SIZE"
-			;;
-			--max-kernel-and-initrd-size*)
-				CMD_MAX_KERNEL_AND_INITRD_SIZE=`parse_opt "${x}"`
-				print_info 2 "MAX_KERNEL_AND_INITRD_SIZE: $CMD_MAX_KERNEL_AND_INITRD_SIZE"
-			;;
-			--minkernpackage*)
-				CMD_MINKERNPACKAGE=`parse_opt "${x}"`
-				print_info 2 "MINKERNPACKAGE: $CMD_MINKERNPACKAGE"
-			;;
-			all)
-				BUILD_ALL=1
-			;;
-			initrd)
-				BUILD_INITRD=1
-			;;
-			kernel)
-				BUILD_KERNEL=1
-			;;
-			--help)
-				usage
-				exit 1
-			;;
-
-		esac
-	done
-}
+	case "$*" in
+	      --kernel-cc*)
+		      CMD_KERNEL_CC=`parse_opt "$*"`
+		      print_info 2 "CMD_KERNEL_CC: $CMD_KERNEL_CC"
+	      ;;
+	      --kernel-ld*)
+		      CMD_KERNEL_LD=`parse_opt "$*"`
+		      print_info 2 "CMD_KERNEL_LD: $CMD_KERNEL_LD"
+	      ;;
+	      --kernel-as*)
+		      CMD_KERNEL_AS=`parse_opt "$*"`
+		      print_info 2 "CMD_KERNEL_AS: $CMD_KERNEL_AS"
+	      ;;
+	      --kernel-make*)
+		      CMD_KERNEL_MAKE=`parse_opt "$*"`
+		      print_info 2 "CMD_KERNEL_MAKE: $CMD_KERNEL_MAKE"
+	      ;;
+	      --utils-cc*)
+		      CMD_UTILS_CC=`parse_opt "$*"`
+		      print_info 2 "CMD_UTILS_CC: $CMD_UTILS_CC"
+	      ;;
+	      --utils-ld*)
+		      CMD_UTILS_LD=`parse_opt "$*"`
+		      print_info 2 "CMD_UTILS_LD: $CMD_UTILS_LD"
+	      ;;
+	      --utils-as*)
+		      CMD_UTILS_AS=`parse_opt "$*"`
+		      print_info 2 "CMD_UTILS_AS: $CMD_UTILS_AS"
+	      ;;
+	      --utils-make*)
+		      CMD_UTILS_MAKE=`parse_opt "$*"`
+		      print_info 2 "CMD_UTILS_MAKE: $CMD_UTILS_MAKE"
+	      ;;
+	      --makeopts*)
+		      CMD_MAKEOPTS=`parse_opt "$*"`
+		      print_info 2 "CMD_MAKEOPTS: $CMD_MAKEOPTS"
+	      ;;
+	      --do-keymap-auto)
+		      CMD_DOKEYMAPAUTO=1
+		      print_info 2 "CMD_DOKEYMAPAUTO: $CMD_DOKEYMAPAUTO"
+	      ;;
+	      --debuglevel*)
+		      CMD_DEBUGLEVEL=`parse_opt "$*"`
+		      DEBUGLEVEL="${CMD_DEBUGLEVEL}"
+		      print_info 2 "CMD_DEBUGLEVEL: $CMD_DEBUGLEVEL"
+	      ;;
+	      --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"
+	      ;;
+	      --no-menuconfig)
+		      CMD_MENUCONFIG=0
+		      print_info 2 "CMD_MENUCONFIG: $CMD_MENUCONFIG"
+	      ;;
+	      --gconfig)
+		      CMD_GCONFIG=1
+		      print_info 2 "CMD_GCONFIG: $CMD_GCONFIG"
+	      ;;
+	      --xconfig)
+		      CMD_XCONFIG=1
+		      print_info 2 "CMD_XCONFIG: $CMD_XCONFIG"
+	      ;;
+	      --mrproper)
+		      CMD_MRPROPER=1
+		      print_info 2 "CMD_MRPROPER: $CMD_MRPROPER"
+	      ;;
+	      --no-mrproper)
+		      CMD_MRPROPER=0
+		      print_info 2 "CMD_MRPROPER: $CMD_MRPROPER"
+	      ;;
+	      --clean)
+		      CMD_CLEAN=1
+		      print_info 2 "CMD_CLEAN: $CMD_CLEAN"
+	      ;;
+	      --no-clean)
+		      CMD_CLEAN=0
+		      print_info 2 "CMD_CLEAN: $CMD_CLEAN"
+	      ;;
+	      --bootsplash)
+		      CMD_BOOTSPLASH=1
+		      print_info 2 "CMD_BOOTSPLASH: $CMD_BOOTSPLASH"
+	      ;;
+	      --no-bootsplash)
+		      CMD_BOOTSPLASH=0
+		      print_info 2 "CMD_BOOTSPLASH: $CMD_BOOTSPLASH"
+	      ;;
+	      --install)
+		      CMD_NOINSTALL=0
+		      print_info 2 "CMD_NOINSTALL: $CMD_NOINSTALL"
+	      ;;
+	      --no-install)
+		      CMD_NOINSTALL=1
+		      print_info 2 "CMD_NOINSTALL: $CMD_NOINSTALL"
+	      ;;
+	      --no-initrdmodules)
+		      CMD_NOINITRDMODULES=1
+		      print_info 2 "CMD_NOINITRDMODULES: $CMD_NOINITRDMODULES"
+	      ;;
+	      --callback*)
+		      CMD_CALLBACK=`parse_opt "$*"`
+		      print_info 2 "CMD_CALLBACK: $CMD_CALLBACK/$*"
+	      ;;
+	      --arch-override*)
+		      CMD_ARCHOVERRIDE=`parse_opt "$*"`
+		      print_info 2 "CMD_ARCHOVERRIDE: $CMD_ARCHOVERRIDE"
+	      ;;
+	      --color)
+		      CMD_USECOLOR=1
+		      print_info 2 "CMD_USECOLOR: $CMD_USECOLOR"
+	      ;;
+	      --no-color)
+		      CMD_USECOLOR=0
+		      print_info 2 "CMD_USECOLOR: $CMD_USECOLOR"
+	      ;;
+	      --debugfile*)
+		      CMD_DEBUGFILE=`parse_opt "$*"`
+		      print_info 2 "CMD_DEBUGFILE: $CMD_DEBUGFILE"
+	      ;;
+	      --kerneldir*)
+		      CMD_KERNELDIR=`parse_opt "$*"`
+		      print_info 2 "CMD_KERNELDIR: $CMD_KERNELDIR"
+	      ;;
+	      --kernel-config*)
+		      CMD_KERNEL_CONFIG=`parse_opt "$*"`
+		      print_info 2 "CMD_KERNEL_CONFIG: $CMD_KERNEL_CONFIG"
+	      ;;
+	      --busybox-config*)
+		      CMD_BUSYBOX_CONFIG=`parse_opt "$*"`
+		      print_info 2 "CMD_BUSYBOX_CONFIG: $CMD_BUSYBOX_CONFIG"
+	      ;;
+	      --busybox-bin*)
+		      CMD_BUSYBOX_BIN=`parse_opt "$*"`
+		      print_info 2 "CMD_BUSYBOX_BIN: $CMD_BUSYBOX_BIN"
+	      ;;
+	      --max-kernel-size*)
+		      CMD_MAX_KERNEL_SIZE=`parse_opt "$*"`
+		      print_info 2 "MAX_KERNEL_SIZE: $CMD_MAX_KERNEL_SIZE"
+	      ;;
+	      --max-initrd-size*)
+		      CMD_MAX_INITRD_SIZE=`parse_opt "$*"`
+		      print_info 2 "MAX_INITRD_SIZE: $CMD_MAX_INITRD_SIZE"
+	      ;;
+	      --max-kernel-and-initrd-size*)
+		      CMD_MAX_KERNEL_AND_INITRD_SIZE=`parse_opt "$*"`
+		      print_info 2 "MAX_KERNEL_AND_INITRD_SIZE: $CMD_MAX_KERNEL_AND_INITRD_SIZE"
+	      ;;
+	      --minkernpackage*)
+		      CMD_MINKERNPACKAGE=`parse_opt "$*"`
+		      print_info 2 "MINKERNPACKAGE: $CMD_MINKERNPACKAGE"
+	      ;;
+	      all)
+		      BUILD_ALL=1
+	      ;;
+	      initrd)
+		      BUILD_INITRD=1
+	      ;;
+	      kernel)
+		      BUILD_KERNEL=1
+	      ;;
+	      --help)
+		      usage
+		      exit 1
+	      ;;
 
+	esac
+}
diff --git a/gen_compile.sh b/gen_compile.sh
index 8fdd3cf..a5fa693 100644
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -115,29 +115,36 @@ compile_generic() {
 		gen_die "compile_generic(): improper usage"
 	fi
 
-	if [ "${2}" = "kernel" ]
+	CMAKEOPTS=${MAKEOPTS}
+	if [ "${2}" = "kernel" ] || [ "${2}" = "runtask" ]
 	then
 		export_kernel_args
 		MAKE=${KERNEL_MAKE}
+		[ "${2}" = "runtask" ] && CMAKEOPTS=${MAKEOPTS/-j?/-j1}
 	elif [ "${2}" = "utils" ]
 	then
 		export_utils_args
 		MAKE=${UTILS_MAKE}
 	fi
 
-	if [ "${DEBUGLEVEL}" -gt "1" ]
+	if [ "${2}" == "runtask" ]
+	then
+		print_info 2 "COMMAND: ${MAKE} ${MAKEOPTS} ${1}" 1 0 1
+		${MAKE} -s ${CMAKEOPTS} ${1}
+		RET=$?
+	elif [ "${DEBUGLEVEL}" -gt "1" ]
 	then
 		# Output to stdout and debugfile
 		print_info 2 "COMMAND: ${MAKE} ${MAKEOPTS} ${1}" 1 0 1
-		${MAKE} ${MAKEOPTS} ${1} 2>&1 | tee -a ${DEBUGFILE}
+		${MAKE} ${CMAKEOPTS} ${1} 2>&1 | tee -a ${DEBUGFILE}
 		RET=$?
 	else
 		# Output to debugfile only
 		print_info 2 "COMMAND: ${MAKE} ${MAKEOPTS} ${1}" 1 0 1
-		${MAKE} ${MAKEOPTS} ${1} >> ${DEBUGFILE} 2>&1
+		${MAKE} ${CMAKEOPTS} ${1} >> ${DEBUGFILE} 2>&1
 		RET=$?
 	fi
-	[ "${RET}" -ne "0" ] && gen_die "compile of ${1} failed"
+	[ "${RET}" -ne "0" ] && gen_die "Failed to compile the \"${1}\" target..."
 
 	unset MAKE
 	if [ "${2}" = "kernel" ]
@@ -151,38 +158,33 @@ compile_generic() {
 }
 
 extract_dietlibc_bincache() {
-	print_info 1 "extracting dietlibc bincache"
-	CURR_DIR=`pwd`
+	print_info 1 "dietlibc: >> Extracting cache..."
 	cd "${TEMP}"
 	rm -rf "${TEMP}/diet" > /dev/null
-	tar -jxpf "${DIETLIBC_BINCACHE}" || gen_die "Could not extract dietlibc bincache"
-	[ ! -d "${TEMP}/diet" ] && gen_die "${TEMP}/diet directory not found"
-	cd "${CURR_DIR}"
+	tar -jxpf "${DIETLIBC_BINCACHE}" || gen_die "Could not extract dietlibc bincache!"
+	[ ! -d "${TEMP}/diet" ] && gen_die "${TEMP}/diet directory not found!"
+	cd - > /dev/null
 }
 
 clean_dietlibc_bincache() {
-	print_info 1 "cleaning up dietlibc bincache"
-	CURR_DIR=`pwd`
 	cd "${TEMP}"
 	rm -rf "${TEMP}/diet" > /dev/null
-	cd "${CURR_DIR}"
+	cd - > /dev/null
 }
 
 
 compile_dep() {
-	# Only make dep for 2.4 kernels
-	if [ "${PAT}" -gt "4" ]
+	# Only run ``make dep'' for 2.4 kernels
+	if [ "${VER}" -eq "2" ] && [ "${PAT}" -le "4" ]
 	then
-		print_info 1 "kernel: skipping make dep for non 2.4 kernels"
-	else
-		print_info 1 "kernel: Making dependencies for linux ${KV}"
+		print_info 1 "kernel: >> Making dependencies..."
 		cd ${KERNEL_DIR}
 		compile_generic "dep" kernel
 	fi
 }
 
 compile_modules() {
-	print_info 1 "kernel: Starting compile of linux ${KV} modules"
+	print_info 1 "        >> Compiling ${KV} modules..."
 	cd ${KERNEL_DIR}
 	compile_generic "modules" kernel
 	export UNAME_MACHINE="${ARCH}"
@@ -196,27 +198,32 @@ compile_modules() {
 }
 
 compile_kernel() {
-	[ "${KERNEL_MAKE}" = "" ] && gen_die "KERNEL_MAKE undefined. Don't know how to compile kernel for arch."
+	[ "${KERNEL_MAKE}" = "" ] && gen_die "KERNEL_MAKE undefined - I don't know how to compile kernel for this arch."
 	cd ${KERNEL_DIR}
-	print_info 1 "kernel: Starting compile of linux ${KV} ${KERNEL_MAKE_DIRECTIVE}"
+	print_info 1 "        >> Compiling ${KV} ${KERNEL_MAKE_DIRECTIVE/_install/ [ install ]/}..."
 	compile_generic "${KERNEL_MAKE_DIRECTIVE}" kernel
 	if [ "${KERNEL_MAKE_DIRECTIVE_2}" != "" ]
 	then
-		print_info 1 "kernel: Starting suppliment compile of linux ${KV} ${KERNEL_MAKE_DIRECTIVE_2}"
+		print_info 1 "        >> Starting supplimental compile of ${KV}: ${KERNEL_MAKE_DIRECTIVE_2}..."
 		compile_generic "${KERNEL_MAKE_DIRECTIVE_2}" kernel
 	fi
-	cp "${KERNEL_BINARY}" "/boot/kernel-${KV}" || gen_die "Could not copy kernel binary to boot"
+	if ! isTrue "${CMD_NOINSTALL}"
+	then
+		cp "${KERNEL_BINARY}" "/boot/kernel-${KV}" || gen_die "Could not copy the kernel binary to /boot!"
+	else
+		cp "${KERNEL_BINARY}" "${TEMP}/kernel-${KV}" || gen_die "Could not copy the kernel binary to ${TEMP}!"
+	fi
 }
 
 compile_busybox() {
 	if [ ! -f "${BUSYBOX_BINCACHE}" ]
 	then
-		[ ! -f "${BUSYBOX_SRCTAR}" ] && gen_die "Could not find busybox source tarball: ${BUSYBOX_SRCTAR}"
-		[ ! -f "${BUSYBOX_CONFIG}" ] && gen_die "Cound not find busybox config file: ${BUSYBOX_CONFIG}"
+		[ ! -f "${BUSYBOX_SRCTAR}" ] && gen_die "Could not find busybox source tarball: ${BUSYBOX_SRCTAR}!"
+		[ ! -f "${BUSYBOX_CONFIG}" ] && gen_die "Cound not find busybox config file: ${BUSYBOX_CONFIG}!"
 		cd "${TEMP}"
 		rm -rf ${BUSYBOX_DIR} > /dev/null
-		tar -jxpf ${BUSYBOX_SRCTAR} || gen_die "Could not extract busybox source tarball"
-		[ ! -d "${BUSYBOX_DIR}" ] && gen_die "Busybox directory ${BUSYBOX_DIR} invalid"
+		tar -jxpf ${BUSYBOX_SRCTAR} || gen_die "Could not extract busybox source tarball!"
+		[ ! -d "${BUSYBOX_DIR}" ] && gen_die "Busybox directory ${BUSYBOX_DIR} is invalid!"
 		cp "${BUSYBOX_CONFIG}" "${BUSYBOX_DIR}/.config"
 		cd "${BUSYBOX_DIR}"
 # Busybox and dietlibc don't play nice right now
@@ -226,9 +233,9 @@ compile_busybox() {
 #			OLD_CC="${UTILS_CC}"
 #			UTILS_CC="${TEMP}/diet/bin/diet ${UTILS_CC}"
 #		fi
-		print_info 1 "Busybox: make oldconfig"
+		print_info 1 "busybox: >> Configuring..."
 		yes "" | compile_generic "oldconfig" utils
-		print_info 1 "Busybox: make all"
+		print_info 1 "busybox: >> Compiling..."
 		compile_generic "all" utils
 # Busybox and dietlibc don't play nice right now
 # 		if [ "${USE_DIETLIBC}" -eq "1" ]
@@ -236,18 +243,17 @@ compile_busybox() {
 #			clean_dietlibc_bincache
 #			UTILS_CC="${OLD_CC}"
 #		fi
-		print_info 1 "Busybox: copying to bincache"
+		print_info 1 "busybox: >> Copying to cache..."
 		[ ! -f "${TEMP}/${BUSYBOX_DIR}/busybox" ] && gen_die "busybox executable does not exist after compile, error"
 		strip "${TEMP}/${BUSYBOX_DIR}/busybox" || gen_die "could not strip busybox"
 		bzip2 "${TEMP}/${BUSYBOX_DIR}/busybox" || gen_die "bzip2 compression of busybox failed"
 		[ ! -f "${TEMP}/${BUSYBOX_DIR}/busybox.bz2" ] && gen_die "could not find compressed busybox binary"
 		mv "${TEMP}/${BUSYBOX_DIR}/busybox.bz2" "${BUSYBOX_BINCACHE}" || gen_die "could not copy busybox binary to arch package directory, does the directory exist?"
 
-		print_info 1 "Busybox: cleaning up"
 		cd "${TEMP}"
 		rm -rf "${BUSYBOX_DIR}" > /dev/null
 	else
-		print_info 1 "Busybox: Found bincache at ${BUSYBOX_BINCACHE}"
+		print_info 1 "busybox: Found cache at ${BUSYBOX_BINCACHE}"
 	fi
 }
 
@@ -255,13 +261,13 @@ compile_modutils() {
 	local ARGS
 	if [ ! -f "${MODUTILS_BINCACHE}" ]
 	then
-		[ ! -f "${MODUTILS_SRCTAR}" ] && gen_die "Could not find modutils source tarball: ${MODUTILS_SRCTAR}"
+		[ ! -f "${MODUTILS_SRCTAR}" ] && gen_die "Could not find modutils source tarball: ${MODUTILS_SRCTAR}!"
 		cd "${TEMP}"
 		rm -rf "${MODUTILS_DIR}"
 		tar -jxpf "${MODUTILS_SRCTAR}"
-		[ ! -d "${MODUTILS_DIR}" ] && gen_die "Modutils directory ${MODUTILS_DIR} invalid"
+		[ ! -d "${MODUTILS_DIR}" ] && gen_die "Modutils directory ${MODUTILS_DIR} invalid!"
 		cd "${MODUTILS_DIR}"
-		print_info 1 "modutils: configure"
+		print_info 1 "modutils: >> Configuring..."
 
 		if [ "${USE_DIETLIBC}" -eq "1" ]
 		then
@@ -271,10 +277,11 @@ compile_modutils() {
 		fi
 
 		export_utils_args
-		./configure --disable-combined --enable-insmod-static >> ${DEBUGFILE} 2>&1 || gen_die "Configure of modutils failed"
+		export ARCH=${ARCH}
+		./configure --disable-combined --enable-insmod-static >> ${DEBUGFILE} 2>&1 || gen_die "Configuring modutils failed!"
 		unset_utils_args
 
-		print_info 1 "modutils: make all"
+		print_info 1 "modutils: >> Compiling..."
 		compile_generic "all" utils
 
  		if [ "${USE_DIETLIBC}" -eq "1" ]
@@ -283,18 +290,17 @@ compile_modutils() {
 			UTILS_CC="${OLD_CC}"
 		fi
 
-		print_info 1 "modutils: copying to bincache"
+		print_info 1 "modutils: >> Copying to cache..."
 		[ ! -f "${TEMP}/${MODUTILS_DIR}/insmod/insmod.static" ] && gen_die "insmod.static does not exist after compilation of modutils"
 		strip "${TEMP}/${MODUTILS_DIR}/insmod/insmod.static" || gen_die "could not strip insmod.static"
 		bzip2 "${TEMP}/${MODUTILS_DIR}/insmod/insmod.static" || gen_die "compression of insmod.static failed"
 		[ ! -f "${TEMP}/${MODUTILS_DIR}/insmod/insmod.static.bz2" ] && gen_die "could not find compressed insmod.static.bz2 binary"
 		mv "${TEMP}/${MODUTILS_DIR}/insmod/insmod.static.bz2" "${MODUTILS_BINCACHE}" || gen_die "could not move compress binary to bincache"
 
-		print_info 1 "modutils: cleaning up"
 		cd "${TEMP}"
 		rm -rf "${MODULE_INIT_TOOLS_DIR}" > /dev/null
 	else
-		print_info 1 "modutils: Found bincache at ${MODUTILS_BINCACHE}"
+		print_info 1 "modutils: Found cache at ${MODUTILS_BINCACHE}"
 	fi
 }
 
@@ -308,7 +314,7 @@ compile_module_init_tools() {
 		tar -jxpf "${MODULE_INIT_TOOLS_SRCTAR}"
 		[ ! -d "${MODULE_INIT_TOOLS_DIR}" ] && gen_die "Module-init-tools directory ${MODULE_INIT_TOOLS_DIR} invalid"
 		cd "${MODULE_INIT_TOOLS_DIR}"
-		print_info 1 "module-init-tools: configure"
+		print_info 1 "module-init-tools: >> Configuring"
 
 		if [ "${USE_DIETLIBC}" -eq "1" ]
 		then
@@ -320,7 +326,7 @@ compile_module_init_tools() {
 		export_utils_args
 		./configure >> ${DEBUGFILE} 2>&1 || gen_die "Configure of module-init-tools failed"
 		unset_utils_args
-		print_info 1 "module-init-tools: make all"
+		print_info 1 "                   >> Compiling..."
 		compile_generic "all" utils
 
  		if [ "${USE_DIETLIBC}" -eq "1" ]
@@ -329,18 +335,17 @@ compile_module_init_tools() {
 			UTILS_CC="${OLD_CC}"
 		fi
 
-		print_info 1 "module-init-tools: copying to bincache"
+		print_info 1 "                   >> Copying to cache..."
 		[ ! -f "${TEMP}/${MODULE_INIT_TOOLS_DIR}/insmod.static" ] && gen_die "insmod.static does not exist after compilation of module-init-tools"
 		strip "${TEMP}/${MODULE_INIT_TOOLS_DIR}/insmod.static" || gen_die "could not strip insmod.static"
 		bzip2 "${TEMP}/${MODULE_INIT_TOOLS_DIR}/insmod.static" || gen_die "compression of insmod.static failed"
 		[ ! -f "${TEMP}/${MODULE_INIT_TOOLS_DIR}/insmod.static.bz2" ] && gen_die "could not find compressed insmod.static.bz2 binary"
 		mv "${TEMP}/${MODULE_INIT_TOOLS_DIR}/insmod.static.bz2" "${MODULE_INIT_TOOLS_BINCACHE}" || gen_die "could not move compressed binary to bincache"
 
-		print_info 1 "module-init-tools: cleaning up"
 		cd "${TEMP}"
 		rm -rf "${MODULE_INIT_TOOLS_DIR}" > /dev/null
 	else
-		print_info 1 "module-init-tools: Found bincache at ${MODULE_INIT_TOOLS_BINCACHE}"
+		print_info 1 "module-init-tools: Found cache at ${MODULE_INIT_TOOLS_BINCACHE}"
 	fi
 }
 
@@ -362,7 +367,7 @@ compile_devfsd() {
 			UTILS_CC="${TEMP}/diet/bin/diet ${UTILS_CC}"
 		fi
 
-		print_info 1 "devfsd: make all"
+		print_info 1 "devfsd: >> Compiling..."
 
 		if [ "${USE_DIETLIBC}" -eq "1" ]
 		then
@@ -377,7 +382,7 @@ compile_devfsd() {
 			UTILS_CC="${OLD_CC}"
 		fi
 
-		print_info 1 "devfsd: copying to bincache"
+		print_info 1 "        >> Copying to cache..."
 		[ ! -f "${TEMP}/${DEVFSD_DIR}/devfsd" ] && gen_die "devfsd executable does not exist after compilation of devfsd"
 		strip "${TEMP}/${DEVFSD_DIR}/devfsd" || gen_die "could not strip devfsd"
 		bzip2 "${TEMP}/${DEVFSD_DIR}/devfsd" || gen_die "compression of devfsd failed"
@@ -389,11 +394,10 @@ compile_devfsd() {
 		[ ! -f "${TEMP}/${DEVFSD_DIR}/devfsd.conf.bz2" ] && gen_die "could not find compressed devfsd.conf.bz2 binary"
 		mv "${TEMP}/${DEVFSD_DIR}/devfsd.conf.bz2" "${DEVFSD_CONF_BINCACHE}" || gen_die "could not move compressed binary to bincache"
 
-		print_info 1 "devfsd: cleaning up"
 		cd "${TEMP}"
-		rm -rf "${DEVFSD_DIR}" > /dev/null
+	#	rm -rf "${DEVFSD_DIR}" > /dev/null
 	else
-		print_info 1 "devfsd: Found bincache at ${DEVFSD_BINCACHE} and ${DEVFSD_CONF_BINCACHE}"
+		print_info 1 "devfsd: Found cache at ${DEVFSD_BINCACHE} and ${DEVFSD_CONF_BINCACHE}..."
 	fi
 }
 
@@ -409,7 +413,8 @@ compile_dietlibc() {
 		ORIGTEMP=`cat "${DIETLIBC_BINCACHE_TEMP}"`
 		if [ "${TEMP}" != "${ORIGTEMP}" ]
 		then
-			print_info 1 "Dietlibc: Bincache exists, but current temp directory is different than original. Rebuilding."
+			print_warning 1 "dietlibc: Bincache exists, but current temp directory"
+			print_warning 1 "          is different than original. Rebuilding."
 			BUILD_DIETLIBC=1
 		fi
 	fi
@@ -422,22 +427,20 @@ compile_dietlibc() {
 		tar -jxpf ${DIETLIBC_SRCTAR} || gen_die "Could not extract dietlibc source tarball"
 		[ ! -d "${DIETLIBC_DIR}" ] && gen_die "Dietlibc directory ${DIETLIBC_DIR} invalid"
 		cd "${DIETLIBC_DIR}"
-		print_info 1 "Dietlibc: make"
+		print_info 1 "dietlibc: >> Compiling..."
 		compile_generic "prefix=${TEMP}/diet" utils
-		print_info 1 "Dietlibc: installing"
+		print_info 1 "          >> Installing..."
 		compile_generic "prefix=${TEMP}/diet install" utils
-		print_info 1 "Dietlibc: copying to bincache"
+		print_info 1 "          >> Copying to bincache..."
 		cd ${TEMP}
-		tar -jcpf "${DIETLIBC_BINCACHE}" diet || gen_die "Could not tar up dietlibc bin"
-		[ ! -f "${DIETLIBC_BINCACHE}" ] && gen_die "bincache not created"
+		tar -jcpf "${DIETLIBC_BINCACHE}" diet || gen_die "Could not tar up the dietlibc binary!"
+		[ ! -f "${DIETLIBC_BINCACHE}" ] && gen_die "Dietlibc cache not created!"
 		echo "${TEMP}" > "${DIETLIBC_BINCACHE_TEMP}"
 
-		print_info 1 "Dietlibc: cleaning up"
 		cd "${TEMP}"
 		rm -rf "${DIETLIBC_DIR}" > /dev/null
 		rm -rf "${TEMP}/diet" > /dev/null
 	else
-		print_info 1 "Dietlibc: Found bincache at ${DIETLIBC_BINCACHE}"
+		print_info 1 "dietlibc: Found cache at ${DIETLIBC_BINCACHE}"
 	fi
 }
-
diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index a65c997..eeb2c68 100644
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -20,20 +20,17 @@ determine_config_file() {
 	then
 		KERNEL_CONFIG="${GK_SHARE}/${ARCH}/kernel-config"
 	else
-		gen_die "no kernel config specified, or file not found"
+		gen_die "Error: No kernel config specified, or file not found!"
 	fi
 }
 
 config_kernel() {
-	print_info 1 "kernel: configuring source"
-
 	determine_config_file
-
-	cd "${KERNEL_DIR}" || gen_die "could not switch to kernel directory"
+	cd "${KERNEL_DIR}" || gen_die "Could not switch to the kernel directory!"
 
 	if isTrue ${MRPROPER}
 	then
-		print_info 1 "kernel: running mrproper"
+		print_info 1 "kernel: >> Running mrproper..."
 		compile_generic "mrproper" kernel
 	fi
 
@@ -41,24 +38,48 @@ config_kernel() {
 	# or we might screw up something someone is trying to test.
 	if isTrue ${CLEAN}
 	then
-		print_info 1 "kernel: using config from ${KERNEL_CONFIG} -- prev backed up to .config.bak"
+		print_info 1 "config: Using config from ${KERNEL_CONFIG}"
+		print_info 1 "        Previous config backed up to .config.bak"
 		cp "${KERNEL_DIR}/.config" "${KERNEL_DIR}/.config.bak" > /dev/null 2>&1
 		cp "${KERNEL_CONFIG}" "${KERNEL_DIR}/.config" || gen_die "could not copy config file"
 
-		print_info 1 "kernel: running oldconfig"
+		print_info 1 "        >> Running oldconfig..."
 		yes "" | compile_generic "oldconfig" kernel
 
-		print_info 1 "kernel: running clean"
+		print_info 1 "kernel: >> Cleaning..."
 		compile_generic "clean" kernel
 	else
-		print_info 1 "kernel: skipping copy of config. CLEAN is OFF"
+		print_info 1 "config: --no-clean is enabled; leaving the .config alone."
 	fi
 	
 	if isTrue ${MENUCONFIG}
 	then
-		print_info 1 "kernel: running menuconfig"
-		make menuconfig
-		[ "$?" != "0" ] && gen_die "menuconfig failed"
+		print_info 1 "config: >> Invoking menuconfig..."
+		compile_generic menuconfig runtask
+		[ "$?" != "0" ] && gen_die "Error: menuconfig failed."
+	elif isTrue ${CMD_GCONFIG}
+	then
+		if [ "${VER}" == "2" ] && [ "${PAT}" -lt "6" ]
+		then
+			print_warning 1 "config: gconfig is not available in 2.4 series kernels. Running xconfig"
+			print_warning 1 "        instead..."
+
+			CMD_GCONFIG=0
+			CMD_XCONFIG=1
+		else
+			print_info 1 "config: >> Invoking gconfig..."
+			compile_generic gconfig kernel
+			[ "$?" != "0" ] && gen_die "Error: gconfig failed."
+
+			CMD_XCONFIG=0
+		fi
+	fi
+
+	if isTrue ${CMD_XCONFIG}
+	then
+		print_info 1 "config: >> Invoking xconfig..."
+		compile_generic xconfig kernel
+		[ "$?" != "0" ] && gen_die "Error: xconfig failed."
 	fi
 
 }
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index f7e9361..e3deb19 100644
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -1,10 +1,6 @@
 #!/bin/bash
 
 get_KV() {
-# don't want VER local anymore, used when finding kernelconfig to use
-#	local VER
-# don't want PAT local anymore, used in initrd
-#	local PAT
 	local SUB
 	local EXV
 	
@@ -32,7 +28,7 @@ determine_real_args() {
 	else
 		KERNEL_DIR=${DEFAULT_KERNEL_SOURCE}
 	fi
-	[ "${KERNEL_DIR}" = "" ] && gen_die "no kernel source directory"
+	[ "${KERNEL_DIR}" = "" ] && gen_die "No kernel source directory!"
 
 	get_KV
 
diff --git a/gen_funcs.sh b/gen_funcs.sh
index b7fd72a..d177a81 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -25,23 +25,23 @@ isTrue() {
 if isTrue ${USECOLOR}
 then
 #	COLS="`stty size 2> /dev/null`"
-#        COLS="`getcols ${COLS}`"
-#        COLS=$((${COLS} - 7))
-#        ENDCOL=$'\e[A\e['${COLS}'G'    # Now, ${ENDCOL} will move us to the end of the
+#       COLS="`getcols ${COLS}`"
+#       COLS=$((${COLS} - 7))
+#       ENDCOL=$'\e[A\e['${COLS}'G'    # Now, ${ENDCOL} will move us to the end of the
                                        # column;  irregardless of character width
 	GOOD=$'\e[32;01m'
 	WARN=$'\e[33;01m'
 	BAD=$'\e[31;01m'
 	NORMAL=$'\e[0m'
-	HILITE=$'\e[36;01m'
-	BRACKET=$'\e[34;01m'
+	BOLD=$'\e[0;01m'
+	UNDER=$'\e[4m'
 else
 	GOOD=""
 	WARN=""
 	BAD=""
 	NORMAL=""
-	HILITE=""
-	BRACKET=""
+	BOLD=""
+	UNDER=""
 fi
 
 
@@ -124,11 +124,16 @@ print_info() {
 	# STRUCTURE DATA TO BE OUTPUT TO FILE, AND OUTPUT IT
 	if [ "${SCRPRINT}" -eq "1" -o "${FORCEFILE}" -eq "1" ]
 	then
+		STRR=${2//${WARN}/}
+		STRR=${STRR//${BAD}/}
+		STRR=${STRR//${BOLD}/}
+		STRR=${STRR//${NORMAL}/}
+
 		if [ "${PREFIXLINE}" = "1" ]
 		then
-			STR="* ${2}"
+			STR="* ${STRR}"
 		else
-			STR="${2}"
+			STR="${STRR}"
 		fi
 
 		if [ "${NEWLINE}" = "0" ]
@@ -142,6 +147,16 @@ print_info() {
 	return 0
 }
 
+print_error()
+{
+	GOOD=${BAD} print_info "$@"
+}
+
+print_warning()
+{
+	GOOD=${WARN} print_info "$@"
+}
+
 # var_replace(var_name, var_value, string)
 # $1 = variable name
 # $2 = variable value
@@ -163,13 +178,31 @@ clear_log() {
 gen_die() {
 	if [ "$#" -gt "0" ]
 	then
-		print_info 1 "gen_die(): ${1}"
+		print_error 1 "ERROR: ${1}"
+	fi
+	echo
+	print_info 1 "-- Grepping log... --"
+	echo
+
+	if isTrue ${USECOLOR}
+	then
+		GREP_COLOR="1" grep -B5 -E --colour=always "([Ww][Aa][Rr][Nn][Ii][Nn][Gg]|[Ee][Rr][Rr][Oo][Rr][ :,!]|[Ff][Aa][Ii][Ll][Ee]?[Dd]?)" ${DEBUGFILE}
+	else
+		grep -B5 -E "([Ww][Aa][Rr][Nn][Ii][Nn][Gg]|[Ee][Rr][Rr][Oo][Rr][ :,!]|[Ff][Aa][Ii][Ll][Ee]?[Dd]?)" ${DEBUGFILE}
 	fi
-	print_info 1 "Please see ${DEBUGFILE} for more info on failures"
-	print_info 1 ""
-	print_info 1 "DO NOT REPORT KERNEL COMPILE FAILURES AS GENKERNEL BUGS!"
-	print_info 1 ""
-	print_info 1 "Report real genkernel bugs to bugs.gentoo.org"
+	echo
+	print_info 1 "-- End log... --"
+	echo
+	print_info 1 "Please consult ${DEBUGFILE} for more information and any"
+	print_info 1 "errors that were reported above."
+	echo
+	print_info 1 "Report any real genkernel bugs to bugs.gentoo.org and"
+	print_info 1 "assign your bug to genkernel@gentoo.org. Please include"
+	print_info 1 "as much information as you can in your bug report; attaching"
+	print_info 1 "${DEBUGFILE} so that your issue can be dealt with effectively."
+	print_info 1 ''
+	print_info 1 "DO ${BAD}NOT${NORMAL} REPORT KERNEL COMPILE FAILURES AS GENKERNEL BUGS!"
+	print_info 1 ''
   	exit 1
 }
 
diff --git a/gen_initrd.sh b/gen_initrd.sh
index 7c3df9c..e7ddd3c 100644
--- a/gen_initrd.sh
+++ b/gen_initrd.sh
@@ -31,8 +31,6 @@ create_base_initrd_sys() {
 	mkdir -p ${TEMP}/initrd-temp/proc
 	mkdir -p ${TEMP}/initrd-temp/temp
 	mkdir -p ${TEMP}/initrd-temp/.initrd
-	mkdir -p ${TEMP}/initrd-temp/new_root
-	mkdir -p ${TEMP}/initrd-temp/keymaps
 	ln -s bin ${TEMP}/initrd-temp/sbin
 	ln -s ../bin ${TEMP}/initrd-temp/usr/bin
 	ln -s ../bin ${TEMP}/initrd-temp/usr/sbin
@@ -44,7 +42,6 @@ create_base_initrd_sys() {
 	echo "REGISTER        .*           MKNEWCOMPAT" >> ${TEMP}/initrd-temp/etc/devfsd.conf
 	echo "UNREGISTER      .*           RMNEWCOMPAT" >> ${TEMP}/initrd-temp/etc/devfsd.conf
 
-
 	cd ${TEMP}/initrd-temp/dev
 	MAKEDEV std
 	MAKEDEV console
@@ -78,10 +75,10 @@ create_base_initrd_sys() {
 
 	for i in '[' ash basename cat chroot clear cp dirname echo env false find \
 	grep gunzip gzip ln ls loadkmap losetup lsmod mkdir mknod more mount mv \
-	pivot_root ps awk pwd rm rmdir rmmod sh sleep tar test touch true umount uname \
+	pivot_root ps awk pwd rm rmdir rmmod sed sh sleep tar test touch true umount uname \
 	xargs yes zcat chmod chown cut kill killall; do
 		rm -f ${TEMP}/initrd-temp/bin/$i > /dev/null
-		ln  ${TEMP}/initrd-temp/bin/busybox ${TEMP}/initrd-temp/bin/$i || gen_die "could not link ${i}"
+		ln  ${TEMP}/initrd-temp/bin/busybox ${TEMP}/initrd-temp/bin/$i || gen_die "Busybox error: could not link ${i}!"
 	done
 }
 
@@ -101,16 +98,17 @@ create_initrd_modules() {
 	else
 		MOD_EXT=".o"
 	fi
+
+	print_info 2 "initrd: >> Searching for modules..."
 	for i in `gen_dep_list`
 	do
-		print_info 2 "$i : module searching" 1 0
 		mymod=`find /lib/modules/${KV} -name "${i}${MOD_EXT}"`
 		if [ -z "${mymod}" ]
 		then
-			print_info 2 "Warning : ${i}${MOD_EXT} not found; skipping..."
+			print_warning 2 "Warning :: ${i}${MOD_EXT} not found; skipping..."
 			continue;
 		fi
-		print_info 2 "copying ${mymod} to initrd"
+		print_info 2 "initrd: >> Copying ${i}${MOD_EXT}..."
 		cp -ax --parents "${mymod}" "${TEMP}/initrd-temp"
 	done
 
@@ -151,12 +149,19 @@ create_initrd_aux() {
 	else
 		cp "${GK_SHARE}/generic/modprobe" "${TEMP}/initrd-temp/sbin/modprobe"
 	fi
+	if isTrue $CMD_DOKEYMAPAUTO
+	then
+		echo 'MY_HWOPTS="${MY_HWOPTS} keymap"' >> ${TEMP}/initrd-temp/etc/initrd.defaults
+	fi
+	mkdir -p "${TEMP}/initrd-temp/lib/keymaps"
+	tar -C "${TEMP}/initrd-temp/lib/keymaps" -zxf "${GK_SHARE}/generic/keymaps.tar.gz"
 
+	cd ${TEMP}/initrd-temp/sbin && ln -s ../linuxrc init
+	cd ${OLDPWD}
 	chmod +x "${TEMP}/initrd-temp/linuxrc"
 	chmod +x "${TEMP}/initrd-temp/etc/initrd.scripts"
 	chmod +x "${TEMP}/initrd-temp/etc/initrd.defaults"
 	chmod +x "${TEMP}/initrd-temp/sbin/modprobe"
-
 }
 
 calc_initrd_size() {
@@ -169,35 +174,31 @@ calc_initrd_size() {
 create_initrd() {
 	local MOD_EXT
 
-	print_info 1 "initrd: creating base system"
+	print_info 1 "initrd: >> Initializing..."
 	create_base_initrd_sys
 
 	if [ "${NOINITRDMODULES}" = "" ]
 	then
-		print_info 1 "initrd: copying modules"
+		print_info 1 "        >> Copying modules..."
 		create_initrd_modules
 	else
-		print_info 1 "initrd: not copying modules"
+		print_info 1 "initrd: Not copying modules..."
 	fi
 
-	print_info 1 "initrd: copying auxilary files"
+	print_info 1 "        >> Copying auxilary files..."
 	create_initrd_aux
 
-	print_info 1 "initrd: calculating initrd size"
 	INITRD_CALC_SIZE=`calc_initrd_size`
-
-	print_info 1 "initrd: calculated size ${INITRD_CALC_SIZE} + 100k slop for fs overhead"
 	INITRD_SIZE=`expr ${INITRD_CALC_SIZE} + 100`
+	print_info 1 "        :: Size is at ${INITRD_SIZE}K"
 
-	print_info 1 "initrd: real size ${INITRD_SIZE}"
-
-	print_info 1 "initrd: creating loopback filesystem"
+	print_info 1 "        >> Creating loopback filesystem..."
 	create_initrd_loop ${INITRD_SIZE}
 
-	print_info 1 "initrd: moving initrd fs to loopback"
+	print_info 1 "        >> Moving initrd files to the loopback..."
 	move_initrd_to_loop
 
-	print_info 1 "initrd: cleaning up and compressing initrd"
+	print_info 1 "        >> Cleaning up and compressing the initrd..."
 	create_initrd_unmount_loop
 
 	if [ "${COMPRESS_INITRD}" ]
@@ -208,12 +209,28 @@ create_initrd() {
 
 	if [ "${BOOTSPLASH}" -eq "1" ]
 	then
-		print_info 1 "initrd: copying bootsplash"
-		/sbin/splash -s -f /etc/bootsplash/default/config/bootsplash-800x600.cfg >> ${TEMP}/initrd-loop || gen_die "could not copy 800x600 bootsplash"
-		/sbin/splash -s -f /etc/bootsplash/default/config/bootsplash-1024x768.cfg >> ${TEMP}/initrd-loop || gen_die "could not copy 1024x768 bootsplash"
-		/sbin/splash -s -f /etc/bootsplash/default/config/bootsplash-1280x1024.cfg >> ${TEMP}/initrd-loop || gen_die "could not copy 1280x1024 bootsplash"
-		/sbin/splash -s -f /etc/bootsplash/default/config/bootsplash-1600x1200.cfg >> ${TEMP}/initrd-loop || gen_die "could not copy 1600x1200 bootsplash"
+		if [ -x /sbin/splash ]
+		then
+			[ -z "${BOOTSPLASH_THEME}" ] && source /etc/conf.d/bootsplash.conf
+			[ -z "${BOOTSPLASH_THEME}" ] && BOOTSPLASH_THEME=default
+			print_info 1 "        >> Installing bootsplash [ using the ${BOOTSPLASH_THEME} theme ]..."
+			for bootRes in '800x600' '1024x768' '1280x1024' '1600x1200'
+			do
+				if [ -f "/etc/bootsplash/${BOOTSPLASH_THEME}/config/bootsplash-${bootRes}.cfg" ]
+				then
+					/sbin/splash -s -f /etc/bootsplash/${BOOTSPLASH_THEME}/config/bootsplash-${bootRes}.cfg >> ${TEMP}/initrd-loop || gen_die "Error: could not copy ${bootRes} bootsplash!"
+				else
+					print_info 1 "splash: Did not find a bootplash for the ${bootRes} resolution..."
+				fi
+			done
+		else
+			print_warning 1 "      >> No bootsplash detected; skipping!"
+		fi
+	fi
+	if ! isTrue "${CMD_NOINSTALL}"
+	then
+		cp ${TEMP}/initrd-loop /boot/initrd-${KV} || gen_die "Could not copy the initrd to /boot!"
+	else
+		mv ${TEMP}/initrd-loop ${TEMP}/initrd-${KV} || gen_die "Could not move the initrd to ${TEMP}/initrd-${KV}!"
 	fi
-	cp ${TEMP}/initrd-loop /boot/initrd-${KV} || gen_die "could not copy initrd to boot"
 }
-
diff --git a/generic/initrd.defaults b/generic/initrd.defaults
index 2fe9c89..f7c0862 100644
--- a/generic/initrd.defaults
+++ b/generic/initrd.defaults
@@ -1,30 +1,30 @@
 #!/bin/ash
+
 PATH=/usr/sbin:/usr/bin:/sbin:/bin
 BACK_UP="\033[1K\033[0G"
-HILITE="\033[1m"
 NORMAL="\033[0m"
-WARN="\033[1m"
-BAD="\033[1m"
+WARN="\033[33;1m"
+BAD="\033[31;1m"
+BOLD="\033[1m"
+GOOD="\033[32;1m"
+
 KV="`uname -r`"
 KMAJOR=`echo $KV | cut -f1 -d.`
 KMINOR=`echo $KV | cut -f2 -d.`
 KVER="${KMAJOR}.${KMINOR}"
 MISCOPTS="cdcache idebug detect"
-HWOPTS="scsi firewire ataraid pcmcia usb"
+HWOPTS="scsi firewire ataraid pcmcia usb keymap"
 MY_HWOPTS="usb firewire"
 QUIET=1
 ROOT_LINKS="bin sbin lib lib64 boot usr opt"
 ROOT_TREES="etc root home var"
+INSMOD="insmod"
 if [ "${KMINOR}" -gt "4" ]
 then
 	KSUFF=".ko"
-	INSMOD="insmod"
 else
 	KSUFF=".o"
-	INSMOD="insmod"
 fi
 
 REAL_ROOT=""
 CDROOT=0
-
-
diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index d454912..d3e7041 100644
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -1,5 +1,6 @@
 #!/bin/ash
 
+. /etc/initrd.defaults
 backup() {
 	echo -ne "\033[0G\033[0K"
 }
@@ -14,17 +15,17 @@ parse_opt() {
 
 modules_scan() {
 	local MODS
+	[ -d /etc/modules/${1} ] || touch /etc/modules/${1}
+
 	MODS=`cat /etc/modules/${1}`
 	for x in ${MODS}
 	do
-		echo -ne "${HILITE}---- Scanning for ${x}..."
-#		MODULE=`find /lib/modules -name "${x}.$KSUFF"`
-		modprobe ${x}
-# > /dev/null 2>&1
+		echo -ne "${BOLD}   ::${NORMAL} Scanning for ${x}..."
+		modprobe ${x} -n
 		if [ $? -eq 0 ]
 		then
 			backup
-			echo -e "${GOOD}---- Detected ${x} hardware${NORMAL}"
+			echo -e "${GOOD}   ::${NORMAL} Detected ${x} hardware..."
 			continue
 		fi
 		backup
@@ -37,7 +38,7 @@ findcdmount() {
 	then
 		for x in $*
 		do
-			echo -e "${HILITE}---- Attempting to mount CD -- ${x}${NORMAL}"
+			echo -e "${GOOD}>>${NORMAL} Attempting to mount CD:- ${x}"
 			mount -t iso9660 -r ${x} /newroot/mnt/cdrom > /dev/null 2>&1
 			if [ "$?" = "0" ]
 			then
@@ -47,7 +48,7 @@ findcdmount() {
 		done
 		if [ "${REAL_ROOT}" != "" ]
 		then
-			echo -e "${HILITE}---- CD medium found on $1${NORMAL}"
+			echo -e "${GOOD}>>${NORMAL} CD medium found on $1"
 		fi
 	fi
 }
diff --git a/generic/keymaps.tar.gz b/generic/keymaps.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..975c3b2256faad7ff981cd73ad9e0044ff105f7f
GIT binary patch
literal 17487
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

literal 0
HcmV?d00001

diff --git a/generic/linuxrc b/generic/linuxrc
index 000ce3d..d9db937 100644
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -8,13 +8,19 @@
 
 USE_DEVFS_NORMAL=1
 
+if [ "$$" != "1" ]
+then
+	echo "/linuxrc has to be run as the init process as the one"
+	echo "with a PID of 1. Try adding init=\"/linuxrc\" to the"
+	echo "kernel command line or running 'exec /linuxrc'."
+	exit 1
+fi
+
 mount -o remount,rw /
-mount /proc
+mount -t proc proc /proc
 
 [ -n "$QUIET" ] && echo "0" > /proc/sys/kernel/printk
 
-echo "${GOOD} Gentoo initrd startup..."
-echo "STEP 1: Command-line parsing"
 CMDLINE=`cat /proc/cmdline`
 # Scan CMDLINE for any specified real_root= or cdroot arguments
 for x in ${CMDLINE}
@@ -61,17 +67,41 @@ done
 
 if [ -d "/lib/modules" ]
 then
-	echo "STEP 2: Module loading"
+	echo -e "${GOOD}>>${NORMAL}${BOLD} Loading modules...${NORMAL}"
 	# Load appropriate kernel modules
-	for x in $MY_HWOPTS
+	for modules in $MY_HWOPTS
 	do
-		modules_scan $x
+		modules_scan $modules
+		eval DO_`echo $modules | sed 's/-//'`=1
 	done
 else
-	echo "STEP 2: Skipping module load. No modules in initrd"
+	echo -e "${GREEN}>>${NORMAL}${BOLD} Skipping module load; no modules in the initrd!${NORMAL}"
 fi
 
-echo "STEP 3: Mounting necessary filesystems per boot options"
+chooseKeymap() {
+	echo -e "${GOOD}>>${NORMAL}${BOLD} Loading keymaps...${NORMAL}"
+	cat /lib/keymaps/keymapList
+	read -p "<< Load keymap: " keymap
+	if [ -e /lib/keymaps/${keymap}.map ]
+	then
+		echo -e "${GOOD}>>${NORMAL}${BOLD} Loading the ''${keymap}'' keymap...${NORMAL}"
+		loadkmap < /lib/keymaps/${keymap}.map
+	elif [ "$keymap" = "" ]
+	then
+		echo -e "${GOOD}>>${NORMAL}${BOLD} Loading default US keymap...${NORMAL}"
+		loadkmap < /lib/keymaps/us.map
+	else
+		echo -e "${BAD}!! ${NORMAL}${BOLD}Sorry, but keymap ''${keymap}'' is invalid!${NORMAL}"
+		chooseKeymap
+	fi
+}
+
+if [ "${DO_keymap}" ]
+then
+	chooseKeymap
+fi
+
+echo -e "${GOOD}>>${NORMAL}${BOLD} Mounting filesystems...${NORMAL}"
 
 mkdir /newroot
 if [ "${CDROOT}" -eq "1" ]
@@ -89,10 +119,8 @@ then
 		findcdmount /newroot/dev/ide/cd/*
 	fi
 
-
 	if [ "${REAL_ROOT}" = "" ]
 	then
-		echo "Dropping to shell so you can fix your shit"
 		exec /bin/ash
 
 		# Undo stuff		
@@ -115,7 +143,7 @@ then
 	devfsd /dev -np
 fi
 
-echo "STEP 4: Determining root device"
+echo -e "${GOOD}>>${NORMAL}${BOLD} Determining root device...${NORMAL}"
 
 while true
 do
@@ -126,40 +154,39 @@ do
 		then
 			/bin/ash
 
-			#set REAL_ROOT to "" so we get a prompt for the real root after the shell exits.
 			REAL_ROOT=""
 			got_good_root=0
 			continue
 		elif [ "${REAL_ROOT}" = "" ]
 		then
-			#no REAL_ROOT determined/specified. Prompt user for root block device.
-			echo "Root block device unspecified or not detected."
-			echo "Please specify a device to boot, or \"shell\" for a shell."
-			echo -n ": "
+			# No REAL_ROOT determined/specified. Prompt user for root block device.
+			echo -e "${BAD}>>${NORMAL} The root block device is unspecified or not detected."
+			echo "   Please specify a device to boot, or \"shell\" for a shell."
+			echo -n "boot() :: "
 			read REAL_ROOT
 			got_good_root=0
 		elif [ -b "${REAL_ROOT}" ]
 		then
 			got_good_root=1
 		else
+			echo -e "${BAD}>>${NORMAL} Block device ${REAL_ROOT} is not a valid root device..."
 			REAL_ROOT=""
 			got_good_root=0
 		fi
 	done
 
-
 	if [ "${CDROOT}" -eq "1" -a "${got_good_root}" = "1" ]
 	then
 		break
 	else
-		echo "STEP 4a: Mounting root"
+		echo -e "${GOOD}>>${NORMAL}${BOLD} Mounting root...${NORMAL}"
 
 		mount -o rw ${REAL_ROOT} /newroot
 		if [ "$?" = "0" ]
 		then
 			break
 		else
-			echo "Could not mount specified ROOT, try again"
+			echo -e "${BAD}>> ${NORMAL}Could not mount specified ROOT, try again"
 			got_good_root=0
 			REAL_ROOT=""
 		fi
@@ -167,27 +194,25 @@ do
 done
 
 [ -n "$QUIET" ] && echo "6" > /proc/sys/kernel/printk
-echo "STEP 5: Finishing up"
-
 check_loop() {
 	if [ "${LOOP}" = "" -o ! -e "mnt/cdrom/${LOOP}" ]
 	then
 		echo "Invalid loop location: ${LOOP}"
-		echo "please export LOOP with a valid location, or reboot and pass a proper loop="
-		echo "kernel command line"
+		echo "Please export LOOP with a valid location, or reboot and pass a proper loop=..."
+		echo "kernel command line!"
 		/bin/ash
 	fi
 }
 
 if [ "${CDROOT}" = "1" ]
 then
-	echo "STEP 5a: filling tmpfs filesystem"
+	echo -e "${GOOD}>>${NORMAL}${BOLD} Filling tmpfs...${NORMAL}"
 	cd /newroot
 
 	# Failsafe if some idiot didn't set loop type
 	if [ "${LOOPTYPE}" = "" ]
 	then
-		echo "YOU FORGOT TO SPECIFY LOOPTYPE TRYING TO AUTODETECT"
+		echo -e "${WARN}** ${NORMAL}${BOLD}Warning: loop type unspecified!${NORMAL}"
 		if [ "${LOOP}" = "/livecd.loop" ]
 		then
 			LOOPTYPE="normal"
@@ -203,7 +228,6 @@ then
 		else
 			LOOPTYPE="noloop"
 		fi
-		echo "DETECTED LOOPTYPE: $LOOPTYPE"
 	fi
 
 	if [ "${LOOPTYPE}" = "normal" ]
@@ -213,7 +237,7 @@ then
 		# bind-mount /dev/ so that loop devices can be found
 		mount -o bind /newroot/dev /dev
 
-		echo "STEP 5a1: mounting loop filesystem"
+		echo -e "${GOOD}>>${NORMAL}${BOLD} Mounting loop filesystem...${NORMAL}"
 		mount -t ext2 -o loop,ro /newroot/mnt/cdrom/${LOOP} /newroot/mnt/livecd
 		if [ "$?" != "0" ]
 		then
@@ -226,7 +250,7 @@ then
 	then
 		check_loop
 		mount -o bind /newroot/dev /dev
-		echo "STEP 5a1: mounting squashfs filesystem"
+		echo -e "${GOOD}>>${NORMAL}${BOLD} Mounting squashfs filesystem...${NORMAL}"
 		mount -t squashfs -o loop,ro /newroot/mnt/cdrom/${LOOP} /newroot/mnt/livecd
 		if [ "$?" != "0" ]
 		then
@@ -238,8 +262,8 @@ then
 	elif [ "${LOOPTYPE}" = "gcloop" ]
 	then
 		check_loop
+		echo -e "${GOOD}>>${NORMAL}${BOLD} Mounting gcloop filesystem...${NORMAL}"
 		mount -o bind /newroot/dev /dev
-		echo "STEP 5a1: mounting gcloop (ext2) filesystem"
 		echo " " | losetup -E 19 -e ucl-0 -p0 /newroot/dev/loop0 /newroot/mnt/cdrom/${LOOP}
 		if [ "$?" != "0" ]
 		then
@@ -258,7 +282,7 @@ then
 		FS_LOCATION="mnt/cdrom"
 	fi
 
-	echo "STEP 5a2: filling filesystem"
+	echo "${GOOD}>>${NORMAL}${BOLD} Filling filesystem...${NORMAL}"
 	for x in ${ROOT_LINKS}
 	do
 		ln -s "${FS_LOCATION}/${x}" "${x}"
@@ -267,63 +291,47 @@ then
 	chmod 1777 tmp
 	(cd /newroot/${FS_LOCATION}; cp -a ${ROOT_TREES} /newroot)
 else
-	echo "STEP 5b: setting up stuff for pivot_root"
 	mkdir -p /newroot/tmp/.initrd
 fi
 
-echo "STEP 5c: redirect console"
-console=/newroot/dev/console
-[ ! -e "$console" ] && mknod $console c 5 1
-exec < $console > $console 2>&1 || echo "CONSOLE REDIRECTION FAILED, /dev ON ROOT DOES NOT CONTAIN console !!!"
-
-echo "STEP 6: pivot_root and exec/chroot real init"
-
+[ ! -e /newroot/dev/console ] && mknod /newroot/dev/console c 5 1
+echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting"
 
 cd /newroot
 pivot_root . tmp/.initrd
+echo -n '.'
 
 if [ "${USE_DEVFS_NORMAL}" -eq "1" -a "${CDROOT}" -eq "0" ]
 then
-	# must mount a new devfs before we can
-	# umount the old one for some reason
-	mount -t proc proc /proc
-	mount -t devfs devfs /dev
-	umount /tmp/.initrd/proc || echo "COULD NOT UMOUNT tmp/.initrd/proc !!!"
-	umount /tmp/.initrd/dev || echo "COULD NOT UMOUNT tmp/.initrd/dev !!!"
-
-	# at this point it lets us umount the new
-	# devfs, don't know why, just does, stop
-	# asking questions!
-	umount /dev
-	umount /proc
-	cp -f /etc/mtab /etc/mtab.initrd-here > /dev/null 2>&1
-
+	umount /tmp/.initrd/proc || echo '*: Failed to unmount the initrd /proc!'
+	mount -n --move /tmp/.initrd/dev dev || echo '*: Failed to move over the /dev tree!'
+	rm /tmp/.initrd/dev -rf || '*: Failed to remove the initrd /dev!'
 elif [ "${CDROOT}" -eq "1" ]
 then
 	# If automount at boot was on with devfs, we'll want to umount it
 	# also umount proc
-	echo "STEP 6a: clean up mounts"
 	mount -t proc proc /proc
-	umount /tmp/.initrd/proc > /dev/null 2>&1 || echo "COULD NOT UMOUNT /tmp/.initrd/proc !!!"
+	umount /tmp/.initrd/proc > /dev/null 2>&1 || echo "*: Failed to unmount /tmp/.initrd/proc!"
 	umount /dev > /dev/null 2>&1
 	umount /proc > /dev/null 2>&1
 fi
+echo -n '.'
 
 # /usr/src/linux/Documentation/initrd.txt 
 # here's the line it says we should do:
 #       exec chroot . /sbin/init </dev/console >/dev/console 2>&1
 
+exec <dev/console >dev/console 2>&1
+echo '.'
 exec chroot . /bin/sh <<- EOF
-	umount /tmp/.initrd || echo "UMOUNT of /tmp/.initrd FAILED!!!" && /sbin/blockdev --flushbufs /dev/ram0
-	echo "INIT: starting /sbin/init ${CMDLINE}"
-	exec /sbin/init ${CMDLINE}
+ 	umount /tmp/.initrd || echo "*: Failed to unmount the initrd!"
+	/sbin/blockdev --flushbufs /dev/ram0 >/dev/null 2>&1
+ 	exec /sbin/init
 EOF
 
-# exec chroot . /sbin/init ${CMDLINE} < /dev/console > /dev/console 2>&1
-echo "IF YOU ARE SEEING THIS MESSAGE, A FATAL ERROR HAS OCCURRED"
-echo "MOST LIKELY /sbin/init DOES NOT EXIST, ATTEMPTING TO DROP"
-echo "YOU TO A SHELL"
-
+echo "A fatal error has probably occured since /sbin/init did not"
+echo "boot correctly. Trying to open a shell..."
+echo
 exec /bin/bash
 exec /bin/sh
 exec /bin/ash
diff --git a/generic/modprobe b/generic/modprobe
index 589efdd..9966e95 100755
--- a/generic/modprobe
+++ b/generic/modprobe
@@ -1,36 +1,23 @@
 #!/bin/ash
 
-#KV=`uname -r`
-#KMAJOR=`echo ${KV} | cut -d. -f1`
-#KMINOR=`echo ${KV} | cut -d. -f2`
-#INSMOD="insmod.static"
-
-#if [ "${KMINOR}" -gt "4" ]
-#then
-#	KEXT=".ko"
-#else
-#	KEXT=".o"
-#fi
-
 . /etc/initrd.defaults
 
 usage()
 {
-	echo "modprobe gentoo script v1.0"
 	echo "Usage:"
 	echo "  modprobe moduleprefix"
-	echo ""
+	echo
 	echo "Ex:"
 	echo "  modprobe eepro100"
-	echo ""
-	echo "Note: Do not pass the suffix to modprobe"
+	echo
+	echo "Note: Do not pass the suffix to modprobe!"
 	exit 1
 }
 
 # Pass module name to this function
 modules_dep_list()
 {
-	if [ "$#" != "1" ]
+	if [ "$#" -lt "1" ]
 	then
 		echo "modules_dep_list(): improper usage"
 		exit 1
@@ -91,7 +78,10 @@ modprobe2()
 	local modlist
 	local ret
 
-	if [ "$#" != "1" ]
+	local echoAppend
+	local echoFlags
+
+	if [ "$#" -lt "1" ]
 	then
 		echo "modprobe(): improper usage"
 		exit 1
@@ -99,8 +89,8 @@ modprobe2()
 	real_path=`real_mod_path ${1}`
 	if [ "${real_path}" = "" -o "${real_path}" = " " ]
 	then
-		echo "no such module found"
-		exit 1
+		echo "module not found..."
+		exit 2
 	fi
 	modlist=`modules_dep_list ${1}`
 	if [ "${modlist}" != "" -a "${modlist}" != " " ]
@@ -109,7 +99,6 @@ modprobe2()
 	else
 		deps=""
 	fi
-#	echo "$1 -- DEPS='${deps}'"
 	# Make sure we don't do any endless loops!
 
 	LOADED_MODULES="${LOADED_MODULES} ${1}"
@@ -119,30 +108,30 @@ modprobe2()
 		then
 			if [ "${x}" != "" -a "${x}" != " " ]
 			then
-#				echo "loading dep: ${x}"
-				modprobe2 "${x}"
+				modprobe2 "${x}" -n
 			fi
 		else
 			filler=1
-#			echo "skipping ${x}, module already loaded by us"
 		fi
 	done
-#	echo "running insmod on '${real_path}'"
 	${INSMOD} ${real_path} > /dev/null 2>&1
 	ret=$?
 	if [ "$ret" -eq "0" ]
 	then
-		echo "module ${real_path} loaded"
+		echoAppend=" loaded..."
+		[ "${2}" = "-n" ] && echoFlags="-n" && echoAppend=", "
+		echo ${echoFlags} "${1}${echoAppend}"
 	fi
 	return $ret
 }
 
 
-if [ "$#" != "1" ]
+if [ "$#" -lt "1" ]
 then
 	usage
 fi
 
+[ -f "/modules.cache" ] || touch /modules.cache
 for x in `cat /modules.cache`
 do
 	LOADED_MODULES="${LOADED_MODULES} ${x}"
diff --git a/genkernel b/genkernel
index 7cd8aa2..672bd35 100755
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Genkernel v3
 
-GK_V="3.0.1"
+GK_V="3.0.2_rc1"
 TEMP="/var/tmp/genkernel"
 
 small_die() {
@@ -25,8 +25,12 @@ BUILD_ALL=0
 BUILD_KERNEL=0
 BUILD_INITRD=0
 
-# Parse all command line options, and load into memory
-parse_cmdline $*
+# Parse all command line options...
+while [ $# -gt 0 ]
+do
+	Option=$1; shift
+	parse_cmdline $Option
+done
 
 if [ "${BUILD_ALL}" -eq 0 -a "${BUILD_KERNEL}" -eq 0 -a "${BUILD_INITRD}" -eq 0 ]
 then
@@ -34,7 +38,7 @@ then
 	exit 1
 fi
 
-print_info 1 "GenKernel v${GK_V}" 1 0
+NORMAL=${GOOD} print_info 1 "Gentoo Linux Genkernel; Version ${GK_V}"
 
 # Set ${ARCH}
 get_official_arch
@@ -49,14 +53,52 @@ source ${GK_SHARE}/${ARCH}/modules_load || gen_die "could not read ${GK_SHARE}/$
 # get the real args for use.
 determine_real_args
 
-print_info 1 "ARCH: ${ARCH}"
-print_info 1 "KERNEL VER: ${KV}"
+NORMAL=${BOLD} print_info 1 "Compiling Linux Kernel ${WARN}${KV}${BOLD} for ${WARN}${ARCH}${BOLD}..."
+echo
 
 if ! has_loop
 then
-	print_info 1 "Your kernel does not appear to have loop device support. "
-	print_info 1 "Please 'modprobe loop' if it is a module before running genkernel"
-	gen_die "----Load loop support----"
+	print_error print_info 1 "Your kernel does not appear to have loop device support. "
+	print_error print_info 1 "Please 'modprobe loop' if it is a module before running genkernel"
+	gen_die "Load loop support!"
+fi
+
+# Check /boot is mounted
+if ! grep -q "/boot" /proc/mounts
+then
+	if isTrue ${MOUNTBOOT}
+	then
+		if ! mount /boot
+		then
+			print_warning 1 "${BOLD}WARNING${NORMAL}: Failed to mount /boot!"
+			echo
+		fi
+	else
+		print_warning 1 "${BOLD}WARNING${NORMAL}: No mounted /boot partition detected!"
+		print_warning 1 '         Run ``mount /boot`` to mount it!'
+		echo
+	fi
+fi
+
+# Check whether another Genkernel is running
+GENPIDS="`ps -C genkernel --no-headers -o pid | wc -l`"
+if [ "${GENPIDS}" -gt "3" ]
+then
+	[ "${GENPIDS}" -gt "4" ] && EX='s'
+	print_warning 1 "${BOLD}WARNING${NORMAL}: Another Genkernel instance is running under"
+	print_warning 1 "         process ID${EX} " 0
+	GENPIDS=`ps -C genkernel --no-headers -o pid`
+	echo -n ${GENPIDS} | sed -e "s/$$//; s/ /, /g"
+	echo "halting..."
+	echo
+	print_warning 1 "Running multiple genkernels on the same source tree will cause data loss!"
+	print_info 1 "Press ^C to halt; ^D to continue [ ${BOLD}if${NORMAL} you know what you're doing! ]"
+	cat
+	echo
+	TEMP="/var/tmp/genkernel-`date | md5sum | cut -d\  -f1`"
+	print_info 1 "thread: Running multiple genkernels may cause problems!"
+	print_info 1 "thread: Temporary files reallocated to ${TEMP}..."
+	echo
 fi
 
 # Configure kernel
@@ -75,6 +117,37 @@ print_info 1 "Copying config for successful build to /etc/kernels/kernel-config-
 [ ! -e "/etc/kernels" ] && mkdir -p /etc/kernels
 cp "${KERNEL_DIR}/.config" "/etc/kernels/kernel-config-${ARCH}-${KV}"
 
+# Run callback
+if [ "${CMD_CALLBACK}" != "" ]
+then
+	print_info 1 "" 1 0
+	print_info 1 "Preparing to run callback: \"${CMD_CALLBACK}\"" 0
+
+	CALLBACK_ESCAPE=0
+	CALLBACK_COUNT=0
+
+	trap "CALLBACK_ESCAPE=1" TERM KILL INT QUIT ABRT
+	while [[ ${CALLBACK_ESCAPE} -eq 0 && ${CALLBACK_COUNT} -lt 5 ]]
+	do
+		sleep 1; echo -n '.';
+		let CALLBACK_COUNT=${CALLBACK_COUNT}+1
+	done
+
+	if [ "${CALLBACK_ESCAPE}" -eq 0 ]
+	then
+		echo
+		echo
+		eval ${CMD_CALLBACK} | tee -a ${DEBUGFILE}
+		echo
+		print_info 1 "<<< Callback exit status: $?"
+	else
+		echo
+		print_info 1 ">>> Callback cancelled..."
+	fi
+	trap - TERM KILL INT QUIT ABRT
+	print_info 1 "" 1 0
+fi
+
 # Compile dietlibc
 if [ "${USE_DIETLIBC}" = "1" ]
 then
@@ -106,20 +179,19 @@ then
 	gen_minkernpackage
 fi
 
-print_info 1 " "
-print_info 1 " "
+print_info 1 ''
 print_info 1 "Kernel compiled successfully!"
-print_info 1 "Required Kernel Params:"
-print_info 1 "  : root=/dev/ram0 init=/linuxrc real_root=/dev/\$ROOT"
-print_info 1 "    where \$ROOT is the devicenode for your root partition as"
-print_info 1 "    you should have specified in /etc/fstab"
-print_info 1 ""
-print_info 1 "You MUST tell your bootloader to use the generated initrd"
-print_info 1 ""
-print_info 1 "Recommended Kernel Params:"
-print_info 1 "  : vga=0x317 splash=verbose"
-print_info 1 ""
+print_info 1 ''
+print_info 1 "Required Kernel Parameters:"
+print_info 1 '    root=/dev/ram0 real_root=/dev/$ROOT init=/linuxrc'
+print_info 1 '    [ And "vga=0x317 splash=verbose" if you use a framebuffer ]'
+print_info 1 ''
+print_info 1 '    Where $ROOT is the device node for your root partition as the'
+print_info 1 '    one specified in /etc/fstab'
+print_info 1 ''
+print_info 1 "You MUST also tell your bootloader to use the generated initrd."
+print_info 1 ''
 print_info 1 "Do NOT report kernel bugs (configs included) as genkernel bugs."
-print_info 1 "Make sure you have the latest genkernel before reporting bugs"
+print_info 1 "Make sure you have the latest genkernel before reporting bugs."
 print_info 1 ""
-print_info 1 "For more info see /usr/share/genkernel/README"
+print_info 1 "For more information please see /usr/share/genkernel/README..."
diff --git a/genkernel.conf b/genkernel.conf
index 42adbff..25b938f 100755
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -1,4 +1,4 @@
-# GenKernel Configuration File v3.0
+# Genkernel Configuration File
 
 # ===========GENKERNEL BASIC CONFIGURATION=============
 
@@ -17,25 +17,21 @@ MRPROPER="yes"
 # Copy bootsplash into the initrd image?
 BOOTSPLASH="yes"
 
-# Should we _not_ install the kernel into the default
-# locations?
-NOINSTALL="yes"
-
 # Override the arch detection?
-# available params "x86", "amd64", "ppc", "sparc"
 # ARCH_OVERRIDE="x86"
 
+# Mount /boot automatically if it isn't mounted?
+MOUNTBOOT="yes"
+
 # Use Color output in Genkernel?
 USECOLOR="yes"
 
-
 # =========GENKERNEL LOCATION CONFIGURATION============
 # Variables:
 #   %%ARCH%% - Final determined architecture
 
 # Default share directory location
 GK_SHARE="/usr/share/genkernel"
-#GK_SHARE="/home/brad/Desktop/genkernel"
 
 # Location of helper-scripts
 #GK_BIN="${GK_SHARE}/bin"
@@ -83,4 +79,3 @@ DEVFSD_SRCTAR="${GK_SHARE}/pkg/devfsd-${DEVFSD_VER}.tar.bz2"
 DEVFSD_DIR="devfsd"
 DEVFSD_BINCACHE="${GK_SHARE}/pkg/%%ARCH%%/devfsd-${DEVFSD_VER}-%%ARCH%%.bz2"
 DEVFSD_CONF_BINCACHE="${GK_SHARE}/pkg/%%ARCH%%/devfsd-conf-${DIETLIBC_VER}-%%ARCH%%.bz2"
-
diff --git a/x86/modules_load b/x86/modules_load
index 809f4cd..e3418b5 100644
--- a/x86/modules_load
+++ b/x86/modules_load
@@ -12,10 +12,6 @@ dmx3191d dpt_i2o imm in2000 ips qla1280 \
 sim710 sym53c416"
 
 FIREWIRE_MODULES="ieee1394 ohci1394 eth1394 sbp2"
-
 ATARAID_MODULES="ataraid pdcraid hptraid"
-
 PCMCIA_MODULES="ide-cs"
-
 USB_MODULES="ehci-hcd uhci usb-ohci hid usb-storage"
-
-- 
2.26.2