More RAID10 fixes (#230268).

5 files changed, 17 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 335c6afb5..06d1b8a4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,13 @@
 	* yuminstall.py:  Remove a couple FIXMEs for things that are now in
 	yum.
 
+	* raid.py (getRaidLevels):  Don't confuse "raid1" and "raid10".
+	* partRequests.py (RaidRequestSpec.getDevice):  RAID levels aren't
+	guaranteed to be one digit.
+	* loader2/loader.c (main):  Load RAID10 module.
+	* scripts/mk-images:  Include RAID10 module.  Patch for all this from
+	Paul P Komkoff Jr <i AT stingr.net> (#230268).
+
 2007-03-21  David Cantrell  <dcantrell@redhat.com>
 
 	* loader2/loader.c (parseCmdLineIp): Don't set ipinfo_set to true here,
diff --git a/loader2/loader.c b/loader2/loader.c
index aa8101e32..343486b03 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -1643,7 +1643,7 @@ int main(int argc, char ** argv) {
     else if (FL_UPDATES(flags))
         loadUpdates(&loaderData);
 
-    mlLoadModuleSet("md:raid0:raid1:raid5:raid6:raid456:fat:msdos:jbd:lock_nolock:gfs2:reiserfs:jfs:xfs:dm-mod:dm-zero:dm-mirror:dm-snapshot:dm-multipath:dm-round-robin:dm-emc", modLoaded, modDeps, modInfo);
+    mlLoadModuleSet("md:raid0:raid1:raid5:raid6:raid456:raid10:fat:msdos:jbd:lock_nolock:gfs2:reiserfs:jfs:xfs:dm-mod:dm-zero:dm-mirror:dm-snapshot:dm-multipath:dm-round-robin:dm-emc", modLoaded, modDeps, modInfo);
 
     usbInitializeMouse(modLoaded, modDeps, modInfo);
 
diff --git a/partRequests.py b/partRequests.py
index e1800e498..118b8e2b9 100644
--- a/partRequests.py
+++ b/partRequests.py
@@ -623,7 +623,7 @@ class RaidRequestSpec(RequestSpec):
         raidmems = []
         for member in self.raidmembers:
             raidmems.append(partitions.getRequestByID(member).device)
-        self.dev = fsset.RAIDDevice(int(self.raidlevel[-1:]),
+        self.dev = fsset.RAIDDevice(int(self.raidlevel[4:]),
                                     raidmems, minor = self.raidminor,
                                     spares = self.raidspares,
                                     existing = self.preexist,
diff --git a/raid.py b/raid.py
index 7948a9b3f..4c11a8af6 100644
--- a/raid.py
+++ b/raid.py
@@ -4,7 +4,7 @@
 #
 # Erik Troan <ewt@redhat.com>
 #
-# Copyright 1999-2002 Red Hat, Inc.
+# Copyright 1999-2007 Red Hat, Inc.
 #
 # This software may be freely redistributed under the terms of the GNU
 # library public license.
@@ -25,10 +25,12 @@ def getRaidLevels():
         for l in f.readlines():
             if not l.startswith("Personalities"):
                 continue
-            for tok in l.split():
-                for lev in ("RAID0", "RAID1", "RAID5", "RAID6", "RAID10"):
-                    if tok.upper().find(lev) != -1:
-                        avail.append(lev)
+
+            lst = l.split()
+
+            for lev in ["RAID0", "RAID1", "RAID5", "RAID6", "RAID10"]:
+                if "[" + lev + "]" in lst or "[" + lev.lower() + "]" in lst:
+                    avail.append(lev)
 
         f.close()
 
diff --git a/scripts/mk-images b/scripts/mk-images
index 07cfcf082..495ce4c02 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -45,7 +45,7 @@ IDEMODS="ide-cd"
 SCSIMODS="sr_mod sg st sd_mod scsi_mod iscsi_tcp"
 FSMODS="fat msdos vfat ext2 ext3 reiserfs jfs xfs gfs2 lock_nolock"
 LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror dm-multipath dm-round-robin dm-emc dm-crypt"
-RAIDMODS="md raid0 raid1 raid5 raid6 raid456"
+RAIDMODS="md raid0 raid1 raid5 raid6 raid456 raid10"
 SECSTAGE="$RAIDMODS $LVMMODS $FSMODS $IDEMODS $SCSIMODS"
 BTERMMODS="vga16fb"
 PCMCIASOCKMODS="yenta_socket i82365 tcic pcmcia"