summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-05-09 20:01:09 +0000
committerJeremy Katz <katzj@redhat.com>2003-05-09 20:01:09 +0000
commit73b7bef61ddd25498207408c31836c8399bfe876 (patch)
tree839a0954690e28b369dd98cc5e74b992a3df0e63
parent6450ca73f8b42623c3121992f73f143a8540035c (diff)
downloadanaconda-73b7bef61ddd25498207408c31836c8399bfe876.tar.gz
anaconda-73b7bef61ddd25498207408c31836c8399bfe876.tar.xz
anaconda-73b7bef61ddd25498207408c31836c8399bfe876.zip
make sure all of the modules we want get pulled in (especially ide-cd for newer
pseries boxes)
-rw-r--r--scripts/mk-images.ppc17
1 files changed, 8 insertions, 9 deletions
diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc
index 0844de063..682d1e0df 100644
--- a/scripts/mk-images.ppc
+++ b/scripts/mk-images.ppc
@@ -1,14 +1,13 @@
COMMONMODULES="nfs fat vfat cramfs loop"
FSMODS="msdos vfat ext3 reiserfs jfs"
-IDEMODS="ide-cd"
+IDEMODULES="ide-cd"
SCSIMODS="sd_mod sr_mod st"
LATEUSBMODS="mousedev usb-storage"
SECSTAGE="raid0 raid1 raid5 lvm-mod $FSMODS $IDEMODS $SCSIMODS $LATEUSBMODS"
-# need yellowfin for IBM?
NETMODULES="sungem tg3 ne2k-pci 3c59x 8139too
- de4x5 acenic pcnet32 tulip natsemi eepro100 airport"
+ de4x5 acenic pcnet32 tulip natsemi e100 e1000 airport"
-SCSIMODULES="advansys aic7xxx initio sym53c8xx"
+SCSIMODULES="$SCSIMODS advansys aic7xxx initio sym53c8xx"
ISERIESMODULES="veth viodasd viocd"
# images we only want on the CD (usually for space reasons)
@@ -27,7 +26,7 @@ makeBootImages() {
makeinitrd --initrdto $TOPDESTPATH/ppc/chrp/ramdisk.image.gz \
--initrdsize 8192 \
--loaderbin loader \
- --modules "$COMMONMODULES $NETMODULES $SCSIMODULES $IDEMODULES $ISOMODULES"
+ --modules "$COMMONMODULES $NETMODULES $SCSIMODULES $SCSIMODS $IDEMODS $ISOMODULES"
mkdir -p $TOPDESTPATH/etc $TOPDESTPATH/ppc/chrp
cp $KERNELROOT/boot/vmlinux-*pseries* $TOPDESTPATH/ppc/chrp/vmlinux
@@ -53,7 +52,7 @@ makeBootImages() {
makeinitrd --initrdto $TOPDESTPATH/ppc/iSeries/ramdisk.image.gz \
--initrdsize 8192 \
--loaderbin loader \
- --modules "$COMMONMODULES $NETMODULES $SCSIMODULES $IDEMODULES $ISOMODULES $ISERIESMODULES"
+ --modules "$COMMONMODULES $NETMODULES $SCSIMODULES $IDEMODS $ISOMODULES $ISERIESMODULES"
cp $KERNELROOT/boot/vmlinux-*iseries* $TOPDESTPATH/ppc/iSeries/vmlinux
cp $KERNELROOT/boot/System.map-*iseries* $TOPDESTPATH/ppc/iSeries/System.map
@@ -71,8 +70,8 @@ makeBootImages() {
}
makeSecondStage() {
- makeinstimage "netstg" "$SECSTAGE $SCSIMODULES $IDEMODULES"
- makeinstimage "hdstg" "$SECSTAGE $NETMODULES $IDEMODULES"
- makemainmodules "$SECSTAGE $NETMODULES $SCSIMODULES $IDEMODULES"
+ makeinstimage "netstg" "$SECSTAGE $SCSIMODULES $IDEMODS"
+ makeinstimage "hdstg" "$SECSTAGE $NETMODULES $IDEMODS"
+ makemainmodules "$SECSTAGE $NETMODULES $SCSIMODULES $IDEMODS"
makemainimage "stage2" "cramfs"
}