fix(dm): remove 59-persistent-storage-dm.rules

59-persistent-storage-dm.rules has been obsolete for a long time.
The blkid builtin is run from 13-dm.rules. The "dmsetup info" call
in this file is actually harmful, because it overrides properties
that have already been set in 10-dm.rules, in particular DM_SUSPENDED,
to which it assigns a string like "Active" or "Suspended", whereas
the stock DM rules and systemd rules expect the property to have
the value "0", or "1", respectively.

Signed-off-by: Martin Wilck <mwilck@suse.com>

diff --git a/modules.d/90dm/59-persistent-storage-dm.rules b/modules.d/90dm/59-persistent-storage-dm.rules
deleted file mode 100644 (file)
index 3e0b8f6..0000000
--- a/modules.d/90dm/59-persistent-storage-dm.rules
+++ /dev/null
@@ -1,15 +0,0 @@
-SUBSYSTEM!="block", GOTO="dm_end"
-ACTION!="add|change", GOTO="dm_end"
-# Also don't process disks that are slated to be a multipath device
-ENV{DM_MULTIPATH_DEVICE_PATH}=="1", GOTO="dm_end"
-
-KERNEL!="dm-[0-9]*", GOTO="dm_end"
-ACTION=="add", GOTO="dm_end"
-IMPORT{program}="/sbin/dmsetup info -c --nameprefixes --unquoted --rows --noheadings -o name,uuid,suspended,readonly,major,minor,open,tables_loaded,names_using_dev -j%M -m%m"
-ENV{DM_NAME}!="?*", GOTO="dm_end"
-ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="dm_end"
-ENV{DM_UUID}=="CRYPT-TEMP-?*", GOTO="dm_end"
-ENV{DM_UUID}!="?*", ENV{DM_NAME}=="temporary-cryptsetup-?*", GOTO="dm_end"
-IMPORT{builtin}="blkid"
-
-LABEL="dm_end"

diff --git a/modules.d/90dm/module-setup.sh b/modules.d/90dm/module-setup.sh
index 5f2ace3e09b2178ee25ebc662339c1856bbf0b07..b96fb0dee0a7158d4461a64850667c7ef68613e7 100755 (executable)
--- a/modules.d/90dm/module-setup.sh
+++ b/modules.d/90dm/module-setup.sh
@@ -27,7 +27,5 @@ install() {
 
     inst_rules "$moddir/11-dm.rules"
 
-    inst_rules "$moddir/59-persistent-storage-dm.rules"
-
     inst_hook shutdown 25 "$moddir/dm-shutdown.sh"
 }