/[smeserver]/rpms/anaconda/sme9/0005-DegradedRAID1.patch
ViewVC logotype

Diff of /rpms/anaconda/sme9/0005-DegradedRAID1.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.1 by wellsi, Mon Dec 16 03:38:12 2013 UTC Revision 1.2 by charliebrady, Fri Jan 3 22:12:21 2014 UTC
# Line 10  diff -ruN anaconda-13.21.195.upstream/st Line 10  diff -ruN anaconda-13.21.195.upstream/st
10                           RAID0: 2}                           RAID0: 2}
11    
12       for raid, min_members in raid_min_members.items():       for raid, min_members in raid_min_members.items():
13  diff -ruN anaconda-13.21.195.upstream/storage/devices.py updates/storage/devices.py  diff -ruN anaconda-13.21.215.upstream/storage/devices.py updates/storage/devices.py
14  --- anaconda-13.21.195.upstream/storage/devices.py      2012-12-10 15:40:04.000000000 -0800  --- anaconda-13.21.215.upstream/storage/devices.py      2012-12-10 15:40:04.000000000 -0800
15  +++ updates/storage/devices.py  2013-12-02 20:19:32.000000000 -0800  +++ updates/storage/devices.py  2013-12-02 20:19:32.000000000 -0800
16  @@ -3139,6 +3144,11 @@  @@ -3145,6 +3150,11 @@
17    
18               disks = [disk.path for disk in self.devices]               disks = [disk.path for disk in self.devices]
19               spares = len(self.devices) - self.memberDevices               spares = len(self.devices) - self.memberDevices
# Line 41  diff -ruN anaconda-13.21.195.upstream/st Line 41  diff -ruN anaconda-13.21.195.upstream/st
41                   self._recursiveRemove(array)                   self._recursiveRemove(array)
42    
43       def _recursiveRemove(self, device):       def _recursiveRemove(self, device):
44  diff -ruN anaconda-13.21.195.upstream/storage/partitioning.py updates/storage/partitioning.py  diff -ruN anaconda-13.21.195.upstream/storage/partspec.py updates/storage/partspec.py
45  --- anaconda-13.21.195.upstream/storage/partitioning.py 2012-11-26 12:42:03.000000000 -0800  --- anaconda-13.21.195.upstream/storage/partspec.py     2012-11-26 12:42:03.000000000 -0800
46  +++ updates/storage/partitioning.py     2013-07-30 14:25:43.000000000 -0700  +++ updates/storage/partspec.py 2013-07-30 14:25:43.000000000 -0700
47    @@ -22,7 +22,7 @@
48     class PartSpec(object):
49         def __init__(self, mountpoint=None, fstype=None, size=None, maxSize=None,
50                      grow=False, asVol=False, singlePV=False, weight=0,
51    -                 requiredSpace=0):
52    +                 requiredSpace=0, useRAID=False):
53             """ Create a new storage specification.  These are used to specify
54                 the default partitioning layout as an object before we have the
55                 storage system up and running.  The attributes are obvious
56    @@ -45,6 +45,8 @@
57                                  other LVs are created inside it.  If not enough
58                                  space exists, this PartSpec will never get turned
59                                  into an LV.
60    +            useRAID -- Should a RAID1 array be created for this volume?  If
61    +                       not, it will be allocated as a partition.
62             """
63    
64             self.mountpoint = mountpoint
65    @@ -56,6 +58,7 @@
66             self.singlePV = singlePV
67             self.weight = weight
68             self.requiredSpace = requiredSpace
69    +        self.useRAID = useRAID
70    
71             if self.singlePV and not self.asVol:
72                 self.asVol = True
73    diff -ruN anaconda-13.21.195/storage/partitioning.py.orig anaconda-13.21.195/storage/partitioning.py
74    --- anaconda-13.21.215/storage/partitioning.py.orig     2013-08-02 09:47:00.000000000 -0400
75    +++ anaconda-13.21.215/storage/partitioning.py  2014-01-03 16:38:31.954668243 -0500
76  @@ -64,6 +64,41 @@  @@ -64,6 +64,41 @@
77    
78       # create a separate pv partition for each disk with free space       # create a separate pv partition for each disk with free space
# Line 111  diff -ruN anaconda-13.21.195.upstream/st Line 140  diff -ruN anaconda-13.21.195.upstream/st
140           if request.fstype is None:           if request.fstype is None:
141               request.fstype = anaconda.id.storage.defaultFSType               request.fstype = anaconda.id.storage.defaultFSType
142           elif request.fstype == "prepboot":           elif request.fstype == "prepboot":
143  @@ -140,6 +193,9 @@  @@ -145,6 +198,9 @@
144       return       return
145    
146   def _scheduleLVs(anaconda, devs):   def _scheduleLVs(anaconda, devs):
# Line 121  diff -ruN anaconda-13.21.195.upstream/st Line 150  diff -ruN anaconda-13.21.195.upstream/st
150       if anaconda.id.storage.encryptedAutoPart:       if anaconda.id.storage.encryptedAutoPart:
151           pvs = []           pvs = []
152           for dev in devs:           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  

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed