diff options
| -rw-r--r-- | storage/formats/dmraid.py | 5 | ||||
| -rw-r--r-- | storage/formats/mdraid.py | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/storage/formats/dmraid.py b/storage/formats/dmraid.py index fdbe14b76..5a05b2b3d 100644 --- a/storage/formats/dmraid.py +++ b/storage/formats/dmraid.py @@ -98,5 +98,10 @@ class DMRaidMember(DeviceFormat): if flags.cmdline.has_key("iswmd"): DMRaidMember._udevTypes.remove("isw_raid_member") +# The anaconda cmdline has not been parsed yet when we're first imported, +# so we can not use flags.dmraid here +if flags.cmdline.has_key("nodmraid"): + DMRaidMember._udevTypes = [] + register_device_format(DMRaidMember) diff --git a/storage/formats/mdraid.py b/storage/formats/mdraid.py index 47a24c14e..f9df111f3 100644 --- a/storage/formats/mdraid.py +++ b/storage/formats/mdraid.py @@ -96,8 +96,10 @@ class MDRaidMember(DeviceFormat): def writeKS(self, f): f.write("raid.%s" % self.mdUuid) - -if flags.cmdline.has_key("iswmd"): +# nodmraid -> Wether to use BIOS RAID or not +# Note the anaconda cmdline has not been parsed yet when we're first imported, +# so we can not use flags.dmraid here +if flags.cmdline.has_key("iswmd") and not flags.cmdline.has_key("nodmraid"): MDRaidMember._udevTypes.append("isw_raid_member") register_device_format(MDRaidMember) |