summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--loader2/loader.c2
-rw-r--r--scripts/mk-images.i3864
-rw-r--r--scripts/mk-images.ia644
-rw-r--r--scripts/mk-images.ppc4
-rw-r--r--scripts/mk-images.s3904
-rw-r--r--scripts/mk-images.x86_644
7 files changed, 28 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index f61bb26f2..67f0aab2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-09-27 Jeremy Katz <katzj@redhat.com>
+
+ * loader2/loader.c: Load dm-zero, dm-snapshot and dm-mirror (#132001)
+
+ * scripts/mk-images.i386:
+ * scripts/mk-images.ia64:
+ * scripts/mk-images.ppc:
+ * scripts/mk-images.s390:
+ * scripts/mk-images.x86_64:
+ Use a variable for raid and lvm modules. Add dm-zero, dm-snapshot
+ and dm-mirror (#132001)
+
2004-09-24 Jeremy Katz <katzj@redhat.com>
* anaconda.spec: Bump version
diff --git a/loader2/loader.c b/loader2/loader.c
index fe9898be6..658f3ff8d 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -1351,7 +1351,7 @@ int main(int argc, char ** argv) {
/* look for cards which require the agpgart module */
agpgartInitialize(modLoaded, modDeps, modInfo, flags);
- mlLoadModuleSetLocation("md:raid0:raid1:raid5:raid6:fat:msdos:jbd:ext3:reiserfs:jfs:xfs:dm-mod",
+ mlLoadModuleSetLocation("md:raid0:raid1:raid5:raid6:fat:msdos:jbd:ext3:reiserfs:jfs:xfs:dm-mod:dm-zero:dm-mirror:dm-snapshot",
modLoaded, modDeps, modInfo, flags,
secondStageModuleLocation);
diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386
index 4ff99d7cd..3cc16e842 100644
--- a/scripts/mk-images.i386
+++ b/scripts/mk-images.i386
@@ -73,7 +73,9 @@ IDEMODS="cdrom ide-cd"
SCSIMODS="cdrom scsi_mod sd_mod sg sr_mod st"
FSMODS="fat msdos vfat ext3 reiserfs jfs xfs"
-SECSTAGE="agpgart md raid0 raid1 raid5 raid6 dm-mod $FSMODS $IDEMODS $SCSIMODS $LATEUSBMODS st parport_pc parport"
+LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror"
+RAIDMODS="md raid0 raid1 raid5 raid6"
+SECSTAGE="agpgart $RAIDMODS $LVMMODS $FSMODS $IDEMODS $SCSIMODS $LATEUSBMODS st parport_pc parport"
BTERMMODULES="vga16fb vgastate"
COMMONMODULES="fat vfat nfs sunrpc lockd floppy cramfs loop edd $USBMODS $BTERMMODULES"
diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64
index bdca2b531..cef04c092 100644
--- a/scripts/mk-images.ia64
+++ b/scripts/mk-images.ia64
@@ -6,7 +6,9 @@ LATEUSBMODS="mousedev"
BTERMMODULES="vga16fb"
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"
+LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror"
+RAIDMODS="md raid0 raid1 raid5 raid6"
+SECSTAGE="nfs fat vfat $RAIDMODS $LVMMODS $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_mbox qla1280 qla2200 qla2300 sym53c8xx mptscsih mptbase ips"
IDEMODULES="ide-mod ide-probe-mod ide-disk ide-cd"
diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc
index 6736a4a1d..ebf4532c3 100644
--- a/scripts/mk-images.ppc
+++ b/scripts/mk-images.ppc
@@ -4,7 +4,9 @@ IDEMODS="ide-cd"
SCSIMODS="sd_mod sg sr_mod st"
USBMODS="ohci-hcd uhci-hcd hid usb-storage sd_mod sr_mod"
LATEUSBMODS="mousedev usb-storage"
-SECSTAGE="md raid0 raid1 raid5 raid6 dm-mod $FSMODS $IDEMODS $SCSIMODS $LATEUSBMODS"
+LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror"
+RAIDMODS="md raid0 raid1 raid5 raid6"
+SECSTAGE="$RAIDMODS $LVMMODS $FSMODS $IDEMODS $SCSIMODS $LATEUSBMODS"
NETMODULES="sungem tg3 ne2k-pci 3c59x 8139too olympic
de4x5 acenic pcnet32 tulip natsemi e100 e1000 airport"
diff --git a/scripts/mk-images.s390 b/scripts/mk-images.s390
index 1048636fc..783a26f69 100644
--- a/scripts/mk-images.s390
+++ b/scripts/mk-images.s390
@@ -12,7 +12,9 @@ IDEMODS=""
SCSIMODS="scsi_mod sd_mod sg sr_mod st zfcp"
FSMODS="vfat msdos ext3 reiserfs jfs xfs"
-SECSTAGE="$IDEMODS $SCSIMODS $FSMODS md raid0 raid1 raid5 raid6 dm-mod"
+LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror"
+RAIDMODS="md raid0 raid1 raid5 raid6"
+SECSTAGE="$IDEMODS $SCSIMODS $FSMODS $LVMMODS $RAIDMODS"
DASDMODS=" dasd_diag_mod dasd_eckd_mod dasd_fba_mod dasd_mod"
COMMONMODULES="loop cramfs tape390 isofs $DASDMODS $SCSIMODS"
NETWORKMODULES="$COMMONMODULES nfs ctc netiucv smsgiucv lcs qdio qeth ccwgroup ipv6"
diff --git a/scripts/mk-images.x86_64 b/scripts/mk-images.x86_64
index 24b036641..aafbbb635 100644
--- a/scripts/mk-images.x86_64
+++ b/scripts/mk-images.x86_64
@@ -46,7 +46,9 @@ IDEMODS="ide-cd"
SCSIMODS="sd_mod sg sr_mod st"
FSMODS="msdos vfat ext3 reiserfs jfs xfs"
-SECSTAGE="agpgart md raid0 raid1 raid5 raid6 dm-mod $FSMODS $IDEMODS $SCSIMODS $LATEUSBMODS st parport_pc parport"
+LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror"
+RAIDMODS="md raid0 raid1 raid5 raid6"
+SECSTAGE="agpgart $RAIDMODS $LVMMODS $FSMODS $IDEMODS $SCSIMODS $LATEUSBMODS st parport_pc parport"
BTERMMODULES="vga16fb"
COMMONMODULES="vfat loop cramfs floppy edd $USBMODS $BTERMMODULES"