anaconda/sme9/0018-RaidN.patch

diff -ru anaconda-13.21.215.orig/storage/partitioning.py anaconda-13.21.215/storage/partitioning.py
--- anaconda-13.21.215.orig/storage/partitioning.py     2014-03-18 15:53:30.178412348 -0400
+++ anaconda-13.21.215/storage/partitioning.py  2014-03-18 16:01:09.724292482 -0400
@@ -141,7 +141,7 @@
                 raid_devs.append(dev)
 
             dev = anaconda.id.storage.newMDArray(fmt_type=request.fstype,
-                      mountpoint=request.mountpoint, level="raid1",
+                      mountpoint=request.mountpoint, level="raid" + request.raidLevel,
                       parents=raid_devs, memberDevices=len(raid_devs))
             anaconda.id.storage.createDevice(dev)
 
diff -ru anaconda-13.21.215.orig/storage/partspec.py anaconda-13.21.215/storage/partspec.py
--- anaconda-13.21.215.orig/storage/partspec.py 2014-03-18 15:53:30.156412448 -0400
+++ anaconda-13.21.215/storage/partspec.py      2014-03-18 16:05:19.340127635 -0400
@@ -22,7 +22,7 @@
 class PartSpec(object):
     def __init__(self, mountpoint=None, fstype=None, size=None, maxSize=None,
                  grow=False, asVol=False, singlePV=False, weight=0,
-                 requiredSpace=0, useRAID=False):
+                 requiredSpace=0, raidLevel="1"):
         """ Create a new storage specification.  These are used to specify
             the default partitioning layout as an object before we have the
             storage system up and running.  The attributes are obvious
@@ -45,7 +45,8 @@
                              other LVs are created inside it.  If not enough
                              space exists, this PartSpec will never get turned
                              into an LV.
-            useRAID -- Should a RAID1 array be created for this volume?  If
+            raidLevel  Level of raid to create, or "none" if no raid
+            useRAID -- Should a RAID array be created for this volume?  If
                        not, it will be allocated as a partition.
         """
 
@@ -58,7 +59,11 @@
         self.singlePV = singlePV
         self.weight = weight
         self.requiredSpace = requiredSpace
-        self.useRAID = useRAID
+        if raidLevel == "none":
+            self.useRAID = False
+        else:
+            self.useRAID = True
+        self.raidLevel = raidLevel
 
         if self.singlePV and not self.asVol:
             self.asVol = True
@@ -67,11 +72,13 @@
         s = ("%(type)s instance (%(id)s) -- \n"
              "  mountpoint = %(mountpoint)s  asVol = %(asVol)s  singlePV = %(singlePV)s\n"
              "  weight = %(weight)s  fstype = %(fstype)s\n"
-             "  size = %(size)s  maxSize = %(maxSize)s  grow = %(grow)s\n" %
+             "  size = %(size)s  maxSize = %(maxSize)s  grow = %(grow)s\n"
+             "  raid level = %(level)\n" %
              {"type": self.__class__.__name__, "id": "%#x" % id(self),
               "mountpoint": self.mountpoint, "asVol": self.asVol,
               "singlePV": self.singlePV, "weight": self.weight,
               "fstype": self.fstype, "size": self.size,
-              "maxSize": self.maxSize, "grow": self.grow})
+              "maxSize": self.maxSize, "grow": self.grow,
+              "level": self.raidLevel})
 
         return s
1	wellsi	1.1	diff -ru anaconda-13.21.215.orig/storage/partitioning.py anaconda-13.21.215/storage/partitioning.py
2			--- anaconda-13.21.215.orig/storage/partitioning.py 2014-03-18 15:53:30.178412348 -0400
3			+++ anaconda-13.21.215/storage/partitioning.py 2014-03-18 16:01:09.724292482 -0400
4			@@ -141,7 +141,7 @@
5			raid_devs.append(dev)
6
7			dev = anaconda.id.storage.newMDArray(fmt_type=request.fstype,
8			- mountpoint=request.mountpoint, level="raid1",
9			+ mountpoint=request.mountpoint, level="raid" + request.raidLevel,
10			parents=raid_devs, memberDevices=len(raid_devs))
11			anaconda.id.storage.createDevice(dev)
12
13			diff -ru anaconda-13.21.215.orig/storage/partspec.py anaconda-13.21.215/storage/partspec.py
14			--- anaconda-13.21.215.orig/storage/partspec.py 2014-03-18 15:53:30.156412448 -0400
15			+++ anaconda-13.21.215/storage/partspec.py 2014-03-18 16:05:19.340127635 -0400
16			@@ -22,7 +22,7 @@
17			class PartSpec(object):
18			def __init__(self, mountpoint=None, fstype=None, size=None, maxSize=None,
19			grow=False, asVol=False, singlePV=False, weight=0,
20			- requiredSpace=0, useRAID=False):
21			+ requiredSpace=0, raidLevel="1"):
22			""" Create a new storage specification. These are used to specify
23			the default partitioning layout as an object before we have the
24			storage system up and running. The attributes are obvious
25			@@ -45,7 +45,8 @@
26			other LVs are created inside it. If not enough
27			space exists, this PartSpec will never get turned
28			into an LV.
29			- useRAID -- Should a RAID1 array be created for this volume? If
30			+ raidLevel Level of raid to create, or "none" if no raid
31			+ useRAID -- Should a RAID array be created for this volume? If
32			not, it will be allocated as a partition.
33			"""
34
35			@@ -58,7 +59,11 @@
36			self.singlePV = singlePV
37			self.weight = weight
38			self.requiredSpace = requiredSpace
39			- self.useRAID = useRAID
40			+ if raidLevel == "none":
41			+ self.useRAID = False
42			+ else:
43			+ self.useRAID = True
44			+ self.raidLevel = raidLevel
45
46			if self.singlePV and not self.asVol:
47			self.asVol = True
48			@@ -67,11 +72,13 @@
49			s = ("%(type)s instance (%(id)s) -- \n"
50			" mountpoint = %(mountpoint)s asVol = %(asVol)s singlePV = %(singlePV)s\n"
51			" weight = %(weight)s fstype = %(fstype)s\n"
52			- " size = %(size)s maxSize = %(maxSize)s grow = %(grow)s\n" %
53			+ " size = %(size)s maxSize = %(maxSize)s grow = %(grow)s\n"
54			+ " raid level = %(level)\n" %
55			{"type": self.__class__.__name__, "id": "%#x" % id(self),
56			"mountpoint": self.mountpoint, "asVol": self.asVol,
57			"singlePV": self.singlePV, "weight": self.weight,
58			"fstype": self.fstype, "size": self.size,
59			- "maxSize": self.maxSize, "grow": self.grow})
60			+ "maxSize": self.maxSize, "grow": self.grow,
61			+ "level": self.raidLevel})
62
63			return s