--- rpms/anaconda/sme9/0005-DegradedRAID1.patch	2013/12/16 03:38:12	1.1
+++ rpms/anaconda/sme9/0005-DegradedRAID1.patch	2014/01/03 22:12:21	1.2
@@ -10,10 +10,10 @@ diff -ruN anaconda-13.21.195.upstream/st
                          RAID0: 2}
  
      for raid, min_members in raid_min_members.items():
-diff -ruN anaconda-13.21.195.upstream/storage/devices.py updates/storage/devices.py
---- anaconda-13.21.195.upstream/storage/devices.py	2012-12-10 15:40:04.000000000 -0800
+diff -ruN anaconda-13.21.215.upstream/storage/devices.py updates/storage/devices.py
+--- anaconda-13.21.215.upstream/storage/devices.py	2012-12-10 15:40:04.000000000 -0800
 +++ updates/storage/devices.py	2013-12-02 20:19:32.000000000 -0800
-@@ -3139,6 +3144,11 @@
+@@ -3145,6 +3150,11 @@
  
              disks = [disk.path for disk in self.devices]
              spares = len(self.devices) - self.memberDevices
@@ -41,9 +41,38 @@ diff -ruN anaconda-13.21.195.upstream/st
                  self._recursiveRemove(array)
  
      def _recursiveRemove(self, device):
-diff -ruN anaconda-13.21.195.upstream/storage/partitioning.py updates/storage/partitioning.py
---- anaconda-13.21.195.upstream/storage/partitioning.py	2012-11-26 12:42:03.000000000 -0800
-+++ updates/storage/partitioning.py	2013-07-30 14:25:43.000000000 -0700
+diff -ruN anaconda-13.21.195.upstream/storage/partspec.py updates/storage/partspec.py
+--- anaconda-13.21.195.upstream/storage/partspec.py	2012-11-26 12:42:03.000000000 -0800
++++ updates/storage/partspec.py	2013-07-30 14:25:43.000000000 -0700
+@@ -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):
++                 requiredSpace=0, useRAID=False):
+         """ 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,6 +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
++                       not, it will be allocated as a partition.
+         """
+ 
+         self.mountpoint = mountpoint
+@@ -56,6 +58,7 @@
+         self.singlePV = singlePV
+         self.weight = weight
+         self.requiredSpace = requiredSpace
++        self.useRAID = useRAID
+ 
+         if self.singlePV and not self.asVol:
+             self.asVol = True
+diff -ruN anaconda-13.21.195/storage/partitioning.py.orig anaconda-13.21.195/storage/partitioning.py
+--- anaconda-13.21.215/storage/partitioning.py.orig	2013-08-02 09:47:00.000000000 -0400
++++ anaconda-13.21.215/storage/partitioning.py	2014-01-03 16:38:31.954668243 -0500
 @@ -64,6 +64,41 @@
  
      # create a separate pv partition for each disk with free space
@@ -111,7 +140,7 @@ diff -ruN anaconda-13.21.195.upstream/st
          if request.fstype is None:
              request.fstype = anaconda.id.storage.defaultFSType
          elif request.fstype == "prepboot":
-@@ -140,6 +193,9 @@
+@@ -145,6 +198,9 @@
      return
  
  def _scheduleLVs(anaconda, devs):
@@ -121,32 +150,3 @@ diff -ruN anaconda-13.21.195.upstream/st
      if anaconda.id.storage.encryptedAutoPart:
          pvs = []
          for dev in devs:
-diff -ruN anaconda-13.21.195.upstream/storage/partspec.py updates/storage/partspec.py
---- anaconda-13.21.195.upstream/storage/partspec.py	2012-11-26 12:42:03.000000000 -0800
-+++ updates/storage/partspec.py	2013-07-30 14:25:43.000000000 -0700
-@@ -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):
-+                 requiredSpace=0, useRAID=False):
-         """ 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,6 +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
-+                       not, it will be allocated as a partition.
-         """
- 
-         self.mountpoint = mountpoint
-@@ -56,6 +58,7 @@
-         self.singlePV = singlePV
-         self.weight = weight
-         self.requiredSpace = requiredSpace
-+        self.useRAID = useRAID
- 
-         if self.singlePV and not self.asVol:
-             self.asVol = True