dmraid: handle isw_raid_member if rd_NO_MDIMSM is set in udev ENV

diff --git a/modules.d/90dmraid/61-dmraid-imsm.rules b/modules.d/90dmraid/61-dmraid-imsm.rules
index 5b9e425b075554362c15bde241d8a08230fe8290..0b7970069053f4be9283a2f684d2937c92f60aaa 100644 (file)
--- a/modules.d/90dmraid/61-dmraid-imsm.rules
+++ b/modules.d/90dmraid/61-dmraid-imsm.rules
@@ -6,7 +6,8 @@ SUBSYSTEM!="block", GOTO="dm_end"
 ACTION!="add|change", GOTO="dm_end"
 
 ENV{ID_FS_TYPE}=="linux_raid_member", GOTO="dm_end"
-ENV{ID_FS_TYPE}=="isw_raid_member", GOTO="dm_end"
+ENV{ID_FS_TYPE}=="isw_raid_member", ENV{rd_NO_MDIMSM}!="?*", GOTO="dm_end"
+
 ENV{ID_FS_TYPE}!="*_raid_member", , GOTO="dm_end"
 TEST=="/tmp/.dmraid_scan-%k", GOTO="dm_end"
 

diff --git a/modules.d/90dmraid/61-dmraid.rules b/modules.d/90dmraid/61-dmraid.rules
deleted file mode 100644 (file)
index 95fc514..0000000
--- a/modules.d/90dmraid/61-dmraid.rules
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file causes block devices with RAID (dmraid) signatures to
-# automatically cause dmraid_scan to be run.
-# See udev(8) for syntax
-
-SUBSYSTEM!="block", GOTO="dm_end"
-ACTION!="add|change", GOTO="dm_end"
-
-ENV{ID_FS_TYPE}=="linux_raid_member", GOTO="dm_end"
-ENV{ID_FS_TYPE}!="*_raid_member", , GOTO="dm_end"
-TEST=="/tmp/.dmraid_scan-%k", , GOTO="dm_end"
-
-RUN+="/bin/sh -c '>/tmp/.dmraid_scan-%k; /bin/ln -fs /sbin/dmraid_scan /initqueue/dmraid_scan.sh'"
-
-ATTR{partition}!="?*", \
-    RUN+="/sbin/partx -d $env{DEVNAME}"
-
-LABEL="dm_end"

diff --git a/modules.d/90dmraid/install b/modules.d/90dmraid/install
index d8aca57b75fcb047c9f03f525f311af00a97c84c..2cd563a91adb19007d5d914b31aeea90a47e5e7f 100755 (executable)
--- a/modules.d/90dmraid/install
+++ b/modules.d/90dmraid/install
@@ -2,8 +2,4 @@
 dracut_install dmraid
 inst "$moddir/dmraid.sh" /sbin/dmraid_scan
 inst_rules 64-md-raid.rules
-if [ ! -x /lib/udev/vol_id ] && mdadm -Q -e imsm /dev/null &> /dev/null; then
-    inst_rules "$moddir/61-dmraid-imsm.rules"
-else
-    inst_rules "$moddir/61-dmraid.rules"
-fi
+inst_rules "$moddir/61-dmraid-imsm.rules"