[blivet:master 20/21] Lookup raid level for any sort of device in DeviceFactory.configure()

mulhern amulhern at redhat.com
Sat May 17 18:51:05 UTC 2014


Previously only mdraid levels were considered valid.

Also, since LinearRAID now exists, do not have to special case 'single'.

Signed-off-by: mulhern <amulhern at redhat.com>
---
 blivet/devicefactory.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/blivet/devicefactory.py b/blivet/devicefactory.py
index 3d75c44..c17a053 100644
--- a/blivet/devicefactory.py
+++ b/blivet/devicefactory.py
@@ -26,6 +26,7 @@ from .devices import LUKSDevice
 from .formats import getFormat
 from .devicelibs import mdraid
 from .devicelibs import lvm
+from .devicelibs import raid
 from .partitioning import SameSizeSet
 from .partitioning import TotalSizeSet
 from .partitioning import doPartitioning
@@ -756,10 +757,10 @@ class DeviceFactory(object):
         # device or container raid level.
         for level_attr in ["raid_level", "container_raid_level"]:
             level = getattr(self, level_attr, None)
-            if level in [None, "single"]:
+            if level is None:
                 continue
 
-            min_disks = mdraid.RAID_levels.raidLevel(level).min_members
+            min_disks = raid.ALL_LEVELS.raidLevel(level).min_members
             disks = set(d for m in self._get_member_devices() for d in m.disks)
             if len(disks) < min_disks:
                 raise DeviceFactoryError("Not enough disks for %s" % level)
-- 
1.8.3.1



More information about the anaconda-patches mailing list