dmraid/mdraid: use ENV{DEVTYPE} instead of ATTR{partition}

diff --git a/modules.d/90dmraid/61-dmraid-imsm.rules b/modules.d/90dmraid/61-dmraid-imsm.rules
index 0b7970069053f4be9283a2f684d2937c92f60aaa..1c32cbed833c9e3daa1fac9d43097c0d518539b5 100644 (file)
--- a/modules.d/90dmraid/61-dmraid-imsm.rules
+++ b/modules.d/90dmraid/61-dmraid-imsm.rules
@@ -13,7 +13,7 @@ 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}!="?*", \
+ENV{DEVTYPE}!="partition", \
     RUN+="/sbin/partx -d $env{DEVNAME}"
 
 LABEL="dm_end"

diff --git a/modules.d/90mdraid/65-md-incremental-imsm.rules b/modules.d/90mdraid/65-md-incremental-imsm.rules
index 7879214ccca248dbdd0df67f28e928a676913a26..be0913963eabf82ac21da3661c0b7679738f174e 100644 (file)
--- a/modules.d/90mdraid/65-md-incremental-imsm.rules
+++ b/modules.d/90mdraid/65-md-incremental-imsm.rules
@@ -15,8 +15,11 @@ IMPORT{program}="/sbin/mdadm --examine --export $tempnode"
 
 LABEL="do_md_inc"
 
-RUN+="/sbin/mdadm -I --no-degraded $env{DEVNAME}", RUN+="/bin/sh -c '>/tmp/.mdraid_start-%k; /bin/ln -s /sbin/mdraid_start /initqueue/mdraid_start.sh'"
+RUN+="/sbin/mdadm -I --no-degraded $env{DEVNAME}"
 
-ATTR{partition}!="?*", RUN+="/sbin/partx -d $env{DEVNAME}"
+RUN+="/bin/sh -c '>/tmp/.mdraid_start-%k; /bin/ln -s /sbin/mdraid_start /initqueue/mdraid_start.sh'"
+
+ENV{DEVTYPE}!="partition", \
+    RUN+="/sbin/partx -d $env{DEVNAME}"
 
 LABEL="md_inc_end"