summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2004-09-23 15:47:25 +0000
committerBill Nottingham <notting@redhat.com>2004-09-23 15:47:25 +0000
commit863f201a7476a68adc1252b80bf7d3993419eae9 (patch)
tree71a4d53b95919b389207eb245b0a7652f05776fd
parentaca501f66f852dd22c0460454bf062c12c9f6aad (diff)
downloadanaconda-863f201a7476a68adc1252b80bf7d3993419eae9.tar.gz
anaconda-863f201a7476a68adc1252b80bf7d3993419eae9.tar.xz
anaconda-863f201a7476a68adc1252b80bf7d3993419eae9.zip
fix megaraid module name
-rw-r--r--ChangeLog4
-rw-r--r--loader2/module-info6
-rw-r--r--scripts/mk-images.i3863
-rw-r--r--scripts/mk-images.ia642
-rw-r--r--scripts/mk-images.x86_643
5 files changed, 8 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 964ab80b8..b039a08fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-23 Bill Nottingham <notting@redhat.com>
+
+ * loader2/module-info, scripts/mk-images.*: fix megaraid module name
+
2004-09-22 Jeremy Katz <katzj@redhat.com>
* anaconda.spec: Bump version.
diff --git a/loader2/module-info b/loader2/module-info
index 771209365..0edd95113 100644
--- a/loader2/module-info
+++ b/loader2/module-info
@@ -682,11 +682,7 @@ lpfc
scsi_hostadapter
"Emulex FC Controller"
-megaraid
- scsi_hostadapter
- "MegaRAID 418, 428, 438, 466, 762"
-
-megaraid2
+megaraid-mbox
scsi_hostadapter
"LSI MegaRAID Controllers"
diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386
index feba0d381..4ff99d7cd 100644
--- a/scripts/mk-images.i386
+++ b/scripts/mk-images.i386
@@ -77,8 +77,7 @@ SECSTAGE="agpgart md raid0 raid1 raid5 raid6 dm-mod $FSMODS $IDEMODS $SCSIMODS $
BTERMMODULES="vga16fb vgastate"
COMMONMODULES="fat vfat nfs sunrpc lockd floppy cramfs loop edd $USBMODS $BTERMMODULES"
-LOCALMODULES="$COMMONMODULES aic7xxx megaraid ncr53c8xx
- sym53c8xx $IDEMODS $SCSIMODS"
+LOCALMODULES="$COMMONMODULES aic7xxx megaraid_mbox sym53c8xx $IDEMODS $SCSIMODS"
NETWORKMODULES="$COMMONMODULES 3c59x
e100 tulip 8139too"
# sis900 e100 hp100 natsemi pcnet32"
diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64
index b392f7bca..bdca2b531 100644
--- a/scripts/mk-images.ia64
+++ b/scripts/mk-images.ia64
@@ -8,7 +8,7 @@ COMMONMODULES="nfs fat vfat cramfs loop floppy $BTERMMODULES"
FSMODS="msdos vfat ext3 reiserfs jfs xfs"
SECSTAGE="nfs fat vfat md raid0 raid1 raid5 raid6 dm-mod $FSMODS $LATEUSBMODS"
NETMODULES="3c59x acenic bcm5700 e100 e1000 eepro100 hamachi sk98lin starfire sunhme tulip yellowfin tg3"
-SCSIMODULES="sd_mod sg sr_mod st scsi_mod DAC960 cciss cpqarray aic7xxx aic7xxx_mod megaraid qla1280 qla2200 qla2300 sym53c8xx sym53c8xx_2 mptscsih mptbase ips"
+SCSIMODULES="sd_mod sg sr_mod st scsi_mod DAC960 cciss cpqarray aic7xxx aic7xxx_mod megaraid_mbox qla1280 qla2200 qla2300 sym53c8xx mptscsih mptbase ips"
IDEMODULES="ide-mod ide-probe-mod ide-disk ide-cd"
prepareBootImage() {
diff --git a/scripts/mk-images.x86_64 b/scripts/mk-images.x86_64
index 2a600c9fd..24b036641 100644
--- a/scripts/mk-images.x86_64
+++ b/scripts/mk-images.x86_64
@@ -50,8 +50,7 @@ SECSTAGE="agpgart md raid0 raid1 raid5 raid6 dm-mod $FSMODS $IDEMODS $SCSIMODS $
BTERMMODULES="vga16fb"
COMMONMODULES="vfat loop cramfs floppy edd $USBMODS $BTERMMODULES"
-LOCALMODULES="$COMMONMODULES aic7xxx megaraid ncr53c8xx
- sym53c8xx $IDEMODS $SCSIMODS"
+LOCALMODULES="$COMMONMODULES aic7xxx megaraid_mbox sym53c8xx $IDEMODS $SCSIMODS"
NETWORKMODULES="$COMMONMODULES nfs 3c59x
e100 tulip pcnet32 8139too"
# sis900 e100 hp100 natsemi"