From 5048c5a84c6ff31e2a37bbdb1e90cd09e39b6e4a Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Wed, 30 Oct 2024 21:51:40 +0100 Subject: [PATCH 1/2] fix(dm): remove 59-persistent-storage-dm.rules (bsc#1232063) 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 (cherry picked from commit https://github.com/dracut-ng/dracut-ng/commit/d2ade8a6bf084c4cfb104dc9eff9917ea9bb9110) --- modules.d/90dm/59-persistent-storage-dm.rules | 15 --------------- modules.d/90dm/module-setup.sh | 3 --- 2 files changed, 18 deletions(-) delete mode 100644 modules.d/90dm/59-persistent-storage-dm.rules diff --git a/modules.d/90dm/59-persistent-storage-dm.rules b/modules.d/90dm/59-persistent-storage-dm.rules deleted file mode 100644 index 2be1122720..0000000000 --- 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 BLKID - -LABEL="dm_end" diff --git a/modules.d/90dm/module-setup.sh b/modules.d/90dm/module-setup.sh index c7bf762d5c..7567d1ece9 100755 --- a/modules.d/90dm/module-setup.sh +++ b/modules.d/90dm/module-setup.sh @@ -32,8 +32,5 @@ install() { inst_rules "$moddir/11-dm.rules" - inst_rules "$moddir/59-persistent-storage-dm.rules" - prepare_udev_rules 59-persistent-storage-dm.rules - inst_hook shutdown 25 "$moddir/dm-shutdown.sh" } From b791e88e135e8df6c1bfca7235454c5a9af2bbca Mon Sep 17 00:00:00 2001 From: Antonio Alvarez Feijoo Date: Mon, 4 Nov 2024 08:55:46 +0100 Subject: [PATCH 2/2] chore(suse): update SUSE maintainers doc --- suse/README.susemaint | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/suse/README.susemaint b/suse/README.susemaint index 41dc149688..d3e8ce096c 100644 --- a/suse/README.susemaint +++ b/suse/README.susemaint @@ -342,4 +342,4 @@ were already merged 3fd43858 fix(mdraid): try to assemble the missing raid device 61ab3386 feat(crypt): force the inclusion of crypttab entries with x-initrd.attach - +d2ade8a6 fix(dm): remove 59-persistent-storage-dm.rules