Hans de Goede wrote:
> Why not just write:
+ elif fmt_type == "isw_raid_member" and flags.cmdline.has_key("iswmd"):
+ log.debug("using MD for isw raid")
+ fmt = MDRaidMember
+ break
The code already defaults to using dmraid, so you only need to check for isw + cmdline
option and then do fmt = MDRaidMember.
This patch was needed for another patch, where _udev_Types in DMRaidMember and MDRaidMember included isw_raid_member.
I've changed this second patch so, here is corrected one:
diff --git a/storage/formats/__init__.py b/storage/formats/__init__.py
index 784bb1c..d6914cc 100644
--- a/storage/formats/__init__.py
+++ b/storage/formats/__init__.py
@@ -112,6 +112,9 @@ def collect_device_format_classes():
log.debug("import of device format module '%s' failed" % mod_name)
def get_device_format_class(fmt_type):
+ from mdraid import MDRaidMember
+ from dmraid import DMRaidMember
+ from flags import flags
""" Return an appropriate format class based on fmt_type. """
if not device_formats:
collect_device_format_classes()
@@ -122,6 +125,10 @@ def get_device_format_class(fmt_type):
if fmt_type and fmt_type == fmt_class._name:
fmt = fmt_class
break
+ elif fmt_type == "isw_raid_member" and flags.cmdline.has_key("iswmd"):
+ log.debug("found MD cmdline parameter")
+ fmt = MDRaidMember
+ break
elif fmt_type in fmt_class._udevTypes:
fmt = fmt_class
break
diff --git a/storage/udev.py b/storage/udev.py
index 63cc3fd..46ccd39 100644
--- a/storage/udev.py
+++ b/storage/udev.py
@@ -308,6 +308,21 @@ def udev_device_is_dmraid(info):
return False
+def udev_device_is_mdraid(info):
+ from formats.mdraid import MDRaidMember
+ from flags import flags
+ if info.has_key("ID_FS_TYPE"):
+ if flags.cmdline.has_key("iswmd"):
+ log.debug("found MD cmdline parameter")
+ if info["ID_FS_TYPE"] == "isw_raid_member":
+ log.debug("use MD for isw")
+ return True
+ else:
+ if info["ID_FS_TYPE"] in MDRaidMember._udevTypes:
+ return True
+
+ return False
+
What is this for, given that we already have the fmt handling above ?
This function is called from changed DeviceTree.addUdevDevice() function, I'm preparing new patch for class DeviceTree.
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
