90dmraid: switch rd_NO_DM to udev ENV

diff --git a/modules.d/90dmraid/61-dmraid-imsm.rules b/modules.d/90dmraid/61-dmraid-imsm.rules
index d610643..801395a 100644 (file)
--- a/modules.d/90dmraid/61-dmraid-imsm.rules
+++ b/modules.d/90dmraid/61-dmraid-imsm.rules
@@ -6,16 +6,20 @@ 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", ENV{rd_NO_MDIMSM}!="?*", GOTO="dm_end"
 
 ENV{ID_FS_TYPE}!="*_raid_member", , GOTO="dm_end"
+
 TEST=="/tmp/.dmraid_scan-%k", GOTO="dm_end"
 
+ENV{DEVTYPE}!="partition", \
+    RUN+="/sbin/partx -d --nr 1-1024 $env{DEVNAME}"
+
+ENV{ID_FS_TYPE}=="isw_raid_member", ENV{rd_NO_MDIMSM}!="?*", GOTO="dm_end"
+
+ENV{rd_NO_DM}=="?*", GOTO="dm_end"
+
 RUN+="/sbin/initqueue --onetime --unique --settled /sbin/dmraid_scan"
 
 ACTION=="change", RUN+="/bin/sh -c '>/tmp/.dmraid_scan-%k'"
 
-ENV{DEVTYPE}!="partition", \
-    RUN+="/sbin/partx -d --nr 1-1024 $env{DEVNAME}"
-
 LABEL="dm_end"

diff --git a/modules.d/90dmraid/parse-dm.sh b/modules.d/90dmraid/parse-dm.sh
index 81d6d33..e6f9161 100644 (file)
--- a/modules.d/90dmraid/parse-dm.sh
+++ b/modules.d/90dmraid/parse-dm.sh
@@ -1,4 +1,4 @@
 if getarg rd_NO_DM; then
     info "rd_NO_DM: removing DM RAID activation"
-    rm /etc/udev/rules.d/61-dmraid*.rules
-fi
\ No newline at end of file
+    udevadm control --property=rd_NO_DM=1
+fi