Attachment #32202 for bug #46278

Lines 1-4 Link Here

(-)genkernel.orig/alpha/modules_load (-5 / +5 lines)
1	SCSI_MODULES="sd_mod sg sr_mod \	1	MODULES_SCSI="sd_mod sg sr_mod \
2	aic7xxx aic7xxx_old BusLogic \	2	aic7xxx aic7xxx_old BusLogic \
3	ncr53c8xx NCR53c406a \	3	ncr53c8xx NCR53c406a \
4	initio advansys aha1740 aha1542 aha152x \	4	initio advansys aha1740 aha1542 aha152x \
Lines 11-21 Link Here
11	dmx3191d dpt_i2o imm in2000 ips qla1280 \	11	dmx3191d dpt_i2o imm in2000 ips qla1280 \
12	sim710 sym53c416"	12	sim710 sym53c416"
13		13
14	FIREWIRE_MODULES="ieee1394 ohci1394 eth1394 sbp2"	14	MODULES_FIREWIRE="ieee1394 ohci1394 eth1394 sbp2"
15		15
16	ATARAID_MODULES="ataraid pdcraid hptraid"	16	MODULES_ATARAID="ataraid pdcraid hptraid"
17		17
18	PCMCIA_MODULES="ide-cs"	18	MODULES_PCMCIA="ide-cs"
19		19
20	USB_MODULES="ehci-hcd uhci usb-ohci hid usb-storage"	20	MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage"
21		21

Lines 92-97 Link Here

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

Lines 51-62 Link Here

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

Lines 1-10 Link Here

(-)genkernel.orig/parisc/modules_load (-5 / +5 lines)
1	SCSI_MODULES=""	1	MODULES_SCSI=""
2		2
3	FIREWIRE_MODULES=""	3	MODULES_FIREWIRE=""
4		4
5	ATARAID_MODULES=""	5	MODULES_ATARAID=""
6		6
7	PCMCIA_MODULES=""	7	MODULES_PCMCIA=""
8		8
9	USB_MODULES="usb-ohci hid usb-storage"	9	MODULES_USB="usb-ohci hid usb-storage"
10		10

Lines 1-10 Link Here

(-)genkernel.orig/parisc64/modules_load (-5 / +5 lines)
1	SCSI_MODULES=""	1	MODULES_SCSI=""
2		2
3	FIREWIRE_MODULES=""	3	MODULES_FIREWIRE=""
4		4
5	ATARAID_MODULES=""	5	MODULES_ATARAID=""
6		6
7	PCMCIA_MODULES=""	7	MODULES_PCMCIA=""
8		8
9	USB_MODULES="usb-ohci hid usb-storage"	9	MODULES_USB="usb-ohci hid usb-storage"
10		10

Lines 1-10 Link Here

(-)genkernel.orig/ppc/modules_load (-5 / +5 lines)
1	SCSI_MODULES=""	1	MODULES_SCSI=""
2		2
3	FIREWIRE_MODULES=""	3	MODULES_FIREWIRE=""
4		4
5	ATARAID_MODULES=""	5	MODULES_ATARAID=""
6		6
7	PCMCIA_MODULES=""	7	MODULES_PCMCIA=""
8		8
9	USB_MODULES=""	9	MODULES_USB=""
10		10

Lines 1-10 Link Here

(-)genkernel.orig/ppc64/modules_load (-5 / +5 lines)
1	SCSI_MODULES=""	1	MODULES_SCSI=""
2		2
3	FIREWIRE_MODULES=""	3	MODULES_FIREWIRE=""
4		4
5	ATARAID_MODULES=""	5	MODULES_ATARAID=""
6		6
7	PCMCIA_MODULES=""	7	MODULES_PCMCIA=""
8		8
9	USB_MODULES=""	9	MODULES_USB=""
10		10

Lines 1-10 Link Here

(-)genkernel.orig/sparc/modules_load (-5 / +5 lines)
1	SCSI_MODULES=""	1	MODULES_SCSI=""
2		2
3	FIREWIRE_MODULES=""	3	MODULES_FIREWIRE=""
4		4
5	ATARAID_MODULES=""	5	MODULES_ATARAID=""
6		6
7	PCMCIA_MODULES=""	7	MODULES_PCMCIA=""
8		8
9	USB_MODULES=""	9	MODULES_USB=""
10		10

Lines 1-10 Link Here

(-)genkernel.orig/sparc64/modules_load (-5 / +5 lines)
1	SCSI_MODULES=""	1	MODULES_SCSI=""
2		2
3	FIREWIRE_MODULES=""	3	MODULES_FIREWIRE=""
4		4
5	ATARAID_MODULES=""	5	MODULES_ATARAID=""
6		6
7	PCMCIA_MODULES=""	7	MODULES_PCMCIA=""
8		8
9	USB_MODULES=""	9	MODULES_USB=""
10		10

Lines 1-4 Link Here

(-)genkernel.orig/x86/modules_load (-5 / +9 lines)
1	SCSI_MODULES="sd_mod sg sr_mod \	1	MODULES_SCSI="sd_mod sg sr_mod \
2	aic7xxx aic7xxx_old BusLogic \	2	aic7xxx aic7xxx_old BusLogic \
3	ncr53c8xx NCR53c406a \	3	ncr53c8xx NCR53c406a \
4	initio advansys aha1740 aha1542 aha152x \	4	initio advansys aha1740 aha1542 aha152x \
Lines 11-17 Link Here
11	dmx3191d dpt_i2o imm in2000 ips qla1280 \	11	dmx3191d dpt_i2o imm in2000 ips qla1280 \
12	sim710 sym53c416"	12	sim710 sym53c416"
13		13
14	FIREWIRE_MODULES="ieee1394 ohci1394 eth1394 sbp2"	14	MODULES_FIREWIRE="ieee1394 ohci1394 eth1394 sbp2"
15	ATARAID_MODULES="ataraid pdcraid hptraid"	15
16	PCMCIA_MODULES="ide-cs"	16	MODULES_ATARAID="ataraid pdcraid hptraid"
17	USB_MODULES="ehci-hcd uhci usb-ohci hid usb-storage"	17
		18	MODULES_PCMCIA="ide-cs"
		19
		20	MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage"
		21




MODULES_SCSI="3w-xxxx dpt_i2o mptscsih mptctl aic79xx"
#MODULES_SCSI="3w-xxxx sata_sil"
#sata_sil sata_promise sata_via \
#MODULES_SCSI="sd_mod sg sr_mod  \
#aic7xxx aic7xxx_old BusLogic \
#ncr53c8xx NCR53c406a \
#initio advansys  aha1740  aha1542  aha152x  \

#dmx3191d dpt_i2o imm in2000 ips qla1280 \
#qlogicfas qlogicfc qlogicisp \

MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"

MODULES_ATARAID="ataraid pdcraid hptraid"

MODULES_PCMCIA="ide-cs"

MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage"


Return to bug 46278

Lines 1-7 Link Here

(-)genkernel.orig/x86_64/modules_load (-7 / +7 lines)
1	SCSI_MODULES="3w-xxxx dpt_i2o mptscsih mptctl aic79xx"	1	MODULES_SCSI="3w-xxxx dpt_i2o mptscsih mptctl aic79xx"
2	#SCSI_MODULES="3w-xxxx sata_sil"	2	#MODULES_SCSI="3w-xxxx sata_sil"
3	#sata_sil sata_promise sata_via \	3	#sata_sil sata_promise sata_via \
4	#SCSI_MODULES="sd_mod sg sr_mod \	4	#MODULES_SCSI="sd_mod sg sr_mod \
5	#aic7xxx aic7xxx_old BusLogic \	5	#aic7xxx aic7xxx_old BusLogic \
6	#ncr53c8xx NCR53c406a \	6	#ncr53c8xx NCR53c406a \
7	#initio advansys aha1740 aha1542 aha152x \	7	#initio advansys aha1740 aha1542 aha152x \
Lines 15-25 Link Here
15	#dmx3191d dpt_i2o imm in2000 ips qla1280 \	15	#dmx3191d dpt_i2o imm in2000 ips qla1280 \
16	#qlogicfas qlogicfc qlogicisp \	16	#qlogicfas qlogicfc qlogicisp \
17		17
18	FIREWIRE_MODULES="ieee1394 ohci1394 sbp2"	18	MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
19		19
20	ATARAID_MODULES="ataraid pdcraid hptraid"	20	MODULES_ATARAID="ataraid pdcraid hptraid"
21		21
22	PCMCIA_MODULES="ide-cs"	22	MODULES_PCMCIA="ide-cs"
23		23
24	USB_MODULES="ehci-hcd uhci usb-ohci hid usb-storage"	24	MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage"
25		25