diff -r -u genkernel.old/alpha/modules_load genkernel/alpha/modules_load
--- genkernel.old/alpha/modules_load	2004-03-30 09:11:12.000000000 -0600
+++ genkernel/alpha/modules_load	2004-03-30 09:21:57.000000000 -0600
@@ -1,3 +1,5 @@
+MODULE_GROUPS="SCSI FIREWIRE ATARAID PCMCI USB"
+
 SCSI_MODULES="sd_mod sg sr_mod  \
 aic7xxx aic7xxx_old BusLogic \
 ncr53c8xx NCR53c406a \
diff -r -u genkernel.old/gen_initrd.sh genkernel/gen_initrd.sh
--- genkernel.old/gen_initrd.sh	2004-03-30 09:11:12.000000000 -0600
+++ genkernel/gen_initrd.sh	2004-03-30 14:08:18.440357568 -0600
@@ -95,6 +95,10 @@
 }
 
 create_initrd_modules() {
+	local group
+	local groupLowerCase
+	local group_modules
+	
 	if [ "${PAT}" -gt "4" ]
 	then
 		MOD_EXT=".ko"
@@ -117,11 +121,12 @@
 	cp -ax --parents /lib/modules/${KV}/modules* ${TEMP}/initrd-temp
 
 	mkdir -p "${TEMP}/initrd-temp/etc/modules"
-	print_list ${SCSI_MODULES} > "${TEMP}/initrd-temp/etc/modules/scsi"
-	print_list ${FIREWIRE_MODULES} > "${TEMP}/initrd-temp/etc/modules/firewire"
-	print_list ${ATARAID_MODULES} > "${TEMP}/initrd-temp/etc/modules/ataraid"
-	print_list ${PCMCIA_MODULES} > "${TEMP}/initrd-temp/etc/modules/pcmcia"
-	print_list ${USB_MODULES} > "${TEMP}/initrd-temp/etc/modules/usb"
+	
+	for group in $MODULE_GROUPS; do
+		groupLowerCase="$(echo $group | tr "[:upper:]" "[:lower:]")"
+		group_modules=${group}_MODULES
+		print_list ${!group_modules} > "${TEMP}/initrd-temp/etc/modules/${groupLowerCase}"
+	done
 }
 
 create_initrd_aux() {
@@ -145,6 +150,9 @@
 	else
 		cp "${GK_SHARE}/generic/initrd.defaults" "${TEMP}/initrd-temp/etc/initrd.defaults"
 	fi
+	
+	echo  "HWOPTS=\"$(echo $MODULE_GROUPS | tr "[:upper:]" "[:lower:]")\"" >> "${TEMP}/initrd-temp/etc/initrd.defaults"
+	
 	if [ -f "${GK_SHARE}/${ARCH}/modprobe" ]
 	then
 		cp "${GK_SHARE}/${ARCH}/modprobe" "${TEMP}/initrd-temp/sbin/modprobe"
diff -r -u genkernel.old/gen_moddeps.sh genkernel/gen_moddeps.sh
--- genkernel.old/gen_moddeps.sh	2004-03-30 09:11:12.000000000 -0600
+++ genkernel/gen_moddeps.sh	2004-03-30 14:10:04.773192520 -0600
@@ -51,13 +51,16 @@
 
 gen_dep_list()
 {
+	local group
+	local group_modules
+	
 	rm -f ${TEMP}/moddeps > /dev/null
-	gen_deps ${SCSI_MODULES}
-	gen_deps ${FIREWIRE_MODULES}
-	gen_deps ${ATARAID_MODULES}
-	gen_deps ${PCMCIA_MODULES}
-	gen_deps ${USB_MODULES}
-
+	
+	for group in $MODULE_GROUPS; do
+		group_modules=${group}_MODULES
+		gen_deps ${!group_modules}
+	done
+	
 	# Only list each module once
 	cat ${TEMP}/moddeps | sort | uniq
 }
diff -r -u genkernel.old/parisc/modules_load genkernel/parisc/modules_load
--- genkernel.old/parisc/modules_load	2004-03-30 09:11:12.000000000 -0600
+++ genkernel/parisc/modules_load	2004-03-30 09:21:41.000000000 -0600
@@ -1,3 +1,5 @@
+MODULE_GROUPS="SCSI FIREWIRE ATARAID PCMCI USB"
+
 SCSI_MODULES=""
 
 FIREWIRE_MODULES=""
diff -r -u genkernel.old/parisc64/modules_load genkernel/parisc64/modules_load
--- genkernel.old/parisc64/modules_load	2004-03-30 09:11:12.000000000 -0600
+++ genkernel/parisc64/modules_load	2004-03-30 09:21:46.000000000 -0600
@@ -1,3 +1,5 @@
+MODULE_GROUPS="SCSI FIREWIRE ATARAID PCMCI USB"
+
 SCSI_MODULES=""
 
 FIREWIRE_MODULES=""
Only in genkernel/pkg/x86: busybox-1.00-pre7-losetup-crypto-alpha-x86.bz2
diff -r -u genkernel.old/ppc/modules_load genkernel/ppc/modules_load
--- genkernel.old/ppc/modules_load	2004-03-30 09:11:12.000000000 -0600
+++ genkernel/ppc/modules_load	2004-03-30 09:22:02.000000000 -0600
@@ -1,3 +1,5 @@
+MODULE_GROUPS="SCSI FIREWIRE ATARAID PCMCI USB"
+
 SCSI_MODULES=""
 
 FIREWIRE_MODULES=""
diff -r -u genkernel.old/sparc/modules_load genkernel/sparc/modules_load
--- genkernel.old/sparc/modules_load	2004-03-30 09:11:12.000000000 -0600
+++ genkernel/sparc/modules_load	2004-03-30 09:21:51.000000000 -0600
@@ -1,3 +1,5 @@
+MODULE_GROUPS="SCSI FIREWIRE ATARAID PCMCI USB"
+
 SCSI_MODULES=""
 
 FIREWIRE_MODULES=""
diff -r -u genkernel.old/sparc64/modules_load genkernel/sparc64/modules_load
--- genkernel.old/sparc64/modules_load	2004-03-30 09:11:12.000000000 -0600
+++ genkernel/sparc64/modules_load	2004-03-30 09:21:43.000000000 -0600
@@ -1,3 +1,5 @@
+MODULE_GROUPS="SCSI FIREWIRE ATARAID PCMCI USB"
+
 SCSI_MODULES=""
 
 FIREWIRE_MODULES=""
diff -r -u genkernel.old/x86/modules_load genkernel/x86/modules_load
--- genkernel.old/x86/modules_load	2004-03-30 09:11:12.000000000 -0600
+++ genkernel/x86/modules_load	2004-03-30 09:21:59.000000000 -0600
@@ -1,3 +1,5 @@
+MODULE_GROUPS="SCSI FIREWIRE ATARAID PCMCI USB"
+
 SCSI_MODULES="sd_mod sg sr_mod  \
 aic7xxx aic7xxx_old BusLogic \
 ncr53c8xx NCR53c406a \
Only in genkernel.old/x86: modules_load~
diff -r -u genkernel.old/x86_64/modules_load genkernel/x86_64/modules_load
--- genkernel.old/x86_64/modules_load	2004-03-30 09:11:12.000000000 -0600
+++ genkernel/x86_64/modules_load	2004-03-30 09:21:37.000000000 -0600
@@ -1,3 +1,5 @@
+MODULE_GROUPS="SCSI FIREWIRE ATARAID PCMCI USB"
+
 SCSI_MODULES="3w-xxxx dpt_i2o mptscsih mptctl aic79xx"
 #SCSI_MODULES="3w-xxxx sata_sil"
 #sata_sil sata_promise sata_via \