Attachment #28392 for bug #46278

Lines 1-3 Link Here

(-)genkernel.old/alpha/modules_load (+2 lines)
		1	MODULE_GROUPS="SCSI FIREWIRE ATARAID PCMCI USB"
		2
1	SCSI_MODULES="sd_mod sg sr_mod \	3	SCSI_MODULES="sd_mod sg sr_mod \
2	aic7xxx aic7xxx_old BusLogic \	4	aic7xxx aic7xxx_old BusLogic \
3	ncr53c8xx NCR53c406a \	5	ncr53c8xx NCR53c406a \

Lines 95-100 Link Here

(-)genkernel.old/gen_initrd.sh (-5 / +13 lines)
95	}	95	}
96		96
97	create_initrd_modules() {	97	create_initrd_modules() {
		98	local group
		99	local groupLowerCase
		100	local group_modules
		101
98	if [ "${PAT}" -gt "4" ]	102	if [ "${PAT}" -gt "4" ]
99	then	103	then
100	MOD_EXT=".ko"	104	MOD_EXT=".ko"
Lines 117-127 Link Here
117	cp -ax --parents /lib/modules/${KV}/modules* ${TEMP}/initrd-temp	121	cp -ax --parents /lib/modules/${KV}/modules* ${TEMP}/initrd-temp
118		122
119	mkdir -p "${TEMP}/initrd-temp/etc/modules"	123	mkdir -p "${TEMP}/initrd-temp/etc/modules"
120	print_list ${SCSI_MODULES} > "${TEMP}/initrd-temp/etc/modules/scsi"	124
121	print_list ${FIREWIRE_MODULES} > "${TEMP}/initrd-temp/etc/modules/firewire"	125	for group in $MODULE_GROUPS; do
122	print_list ${ATARAID_MODULES} > "${TEMP}/initrd-temp/etc/modules/ataraid"	126	groupLowerCase="$(echo $group \| tr "[:upper:]" "[:lower:]")"
123	print_list ${PCMCIA_MODULES} > "${TEMP}/initrd-temp/etc/modules/pcmcia"	127	group_modules=${group}_MODULES
124	print_list ${USB_MODULES} > "${TEMP}/initrd-temp/etc/modules/usb"	128	print_list ${!group_modules} > "${TEMP}/initrd-temp/etc/modules/${groupLowerCase}"
		129	done
125	}	130	}
126		131
127	create_initrd_aux() {	132	create_initrd_aux() {
Lines 145-150 Link Here
145	else	150	else
146	cp "${GK_SHARE}/generic/initrd.defaults" "${TEMP}/initrd-temp/etc/initrd.defaults"	151	cp "${GK_SHARE}/generic/initrd.defaults" "${TEMP}/initrd-temp/etc/initrd.defaults"
147	fi	152	fi
		153
		154	echo "HWOPTS=\"$(echo $MODULE_GROUPS \| tr "[:upper:]" "[:lower:]")\"" >> "${TEMP}/initrd-temp/etc/initrd.defaults"
		155
148	if [ -f "${GK_SHARE}/${ARCH}/modprobe" ]	156	if [ -f "${GK_SHARE}/${ARCH}/modprobe" ]
149	then	157	then
150	cp "${GK_SHARE}/${ARCH}/modprobe" "${TEMP}/initrd-temp/sbin/modprobe"	158	cp "${GK_SHARE}/${ARCH}/modprobe" "${TEMP}/initrd-temp/sbin/modprobe"





gen_dep_list()
{
	local group
	local group_modules
	
	rm -f ${TEMP}/moddeps > /dev/null
	
	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
}

Lines 1-3 Link Here

(-)genkernel.old/parisc/modules_load (+2 lines)
		1	MODULE_GROUPS="SCSI FIREWIRE ATARAID PCMCI USB"
		2
1	SCSI_MODULES=""	3	SCSI_MODULES=""
2		4
3	FIREWIRE_MODULES=""	5	FIREWIRE_MODULES=""

Lines 1-3 Link Here

(-)genkernel.old/parisc64/modules_load (+2 lines)
		1	MODULE_GROUPS="SCSI FIREWIRE ATARAID PCMCI USB"
		2
1	SCSI_MODULES=""	3	SCSI_MODULES=""
2		4
3	FIREWIRE_MODULES=""	5	FIREWIRE_MODULES=""

Lines 1-3 Link Here

(-)genkernel.old/ppc/modules_load (+2 lines)
		1	MODULE_GROUPS="SCSI FIREWIRE ATARAID PCMCI USB"
		2
1	SCSI_MODULES=""	3	SCSI_MODULES=""
2		4
3	FIREWIRE_MODULES=""	5	FIREWIRE_MODULES=""

Lines 1-3 Link Here

(-)genkernel.old/sparc/modules_load (+2 lines)
		1	MODULE_GROUPS="SCSI FIREWIRE ATARAID PCMCI USB"
		2
1	SCSI_MODULES=""	3	SCSI_MODULES=""
2		4
3	FIREWIRE_MODULES=""	5	FIREWIRE_MODULES=""

Lines 1-3 Link Here

(-)genkernel.old/sparc64/modules_load (+2 lines)
		1	MODULE_GROUPS="SCSI FIREWIRE ATARAID PCMCI USB"
		2
1	SCSI_MODULES=""	3	SCSI_MODULES=""
2		4
3	FIREWIRE_MODULES=""	5	FIREWIRE_MODULES=""

Lines 1-3 Link Here

(-)genkernel.old/x86/modules_load (+2 lines)
		1	MODULE_GROUPS="SCSI FIREWIRE ATARAID PCMCI USB"
		2
1	SCSI_MODULES="sd_mod sg sr_mod \	3	SCSI_MODULES="sd_mod sg sr_mod \
2	aic7xxx aic7xxx_old BusLogic \	4	aic7xxx aic7xxx_old BusLogic \
3	ncr53c8xx NCR53c406a \	5	ncr53c8xx NCR53c406a \

Lines 1-3 Link Here

(-)genkernel.old/x86_64/modules_load (+2 lines)
		1	MODULE_GROUPS="SCSI FIREWIRE ATARAID PCMCI USB"
		2
1	SCSI_MODULES="3w-xxxx dpt_i2o mptscsih mptctl aic79xx"	3	SCSI_MODULES="3w-xxxx dpt_i2o mptscsih mptctl aic79xx"
2	#SCSI_MODULES="3w-xxxx sata_sil"	4	#SCSI_MODULES="3w-xxxx sata_sil"
3	#sata_sil sata_promise sata_via \	5	#sata_sil sata_promise sata_via \

Return to bug 46278

Lines 51-63 Link Here

(-)genkernel.old/gen_moddeps.sh (-6 / +9 lines)
51		51
52	gen_dep_list()	52	gen_dep_list()
53	{	53	{
		54	local group
		55	local group_modules
		56
54	rm -f ${TEMP}/moddeps > /dev/null	57	rm -f ${TEMP}/moddeps > /dev/null
55	gen_deps ${SCSI_MODULES}	58
56	gen_deps ${FIREWIRE_MODULES}	59	for group in $MODULE_GROUPS; do
57	gen_deps ${ATARAID_MODULES}	60	group_modules=${group}_MODULES
58	gen_deps ${PCMCIA_MODULES}	61	gen_deps ${!group_modules}
59	gen_deps ${USB_MODULES}	62	done
60		63
61	# Only list each module once	64	# Only list each module once
62	cat ${TEMP}/moddeps \| sort \| uniq	65	cat ${TEMP}/moddeps \| sort \| uniq
63	}	66	}