udev rules: add some by-pass rules from Fedora

1/ If ANACONDA is running, don't -I assemble any arrays, ANACONDA
   needs to be in control
2/ honour "noiswmd" and "nodmraid" kernel command line options.

Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/udev-md-raid-assembly.rules b/udev-md-raid-assembly.rules
index a668e161f26fed346a7f46884d33b7b633b910ee..22adc1dbafd46568a842c471767f9356ca421ae1 100644 (file)
--- a/udev-md-raid-assembly.rules
+++ b/udev-md-raid-assembly.rules
@@ -1,11 +1,26 @@
 # do not edit this file, it will be overwritten on update
 
+# Don't process any events if anaconda is running as anaconda brings up
+# raid devices manually
+ENV{ANACONDA}=="?*", GOTO="md_inc_end"
 # assemble md arrays
 
 SUBSYSTEM!="block", GOTO="md_inc_end"
 
 # handle potential components of arrays (the ones supported by md)
-ENV{ID_FS_TYPE}=="ddf_raid_member|isw_raid_member|linux_raid_member", GOTO="md_inc"
+ENV{ID_FS_TYPE}=="linux_raid_member", GOTO="md_inc"
+
+# "noiswmd" on kernel command line stops mdadm from handling
+#  "isw" (aka IMSM - Intel RAID).
+# "nodmraid" on kernel command line stops mdadm from handling
+#  "isw" or "ddf".
+IMPORT{cmdline}="noiswmd"
+IMPORT{cmdline}="nodmraid"
+
+ENV{nodmraid}=="?*", GOTO="md_inc_end"
+ENV{ID_FS_TYPE}=="ddf_raid_member", GOTO="md_inc"
+ENV{noiswmd}=="?*", GOTO="md_inc_end"
+ENV{ID_FS_TYPE}=="isw_raid_member", GOTO="md_inc"
 GOTO="md_inc_end"
 
 LABEL="md_inc"