39 lines
2.0 KiB
Diff
39 lines
2.0 KiB
Diff
|
From cc3214c24425eb283dd46435345c28e5398b3570 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Marian Csontos <mcsontos@redhat.com>
|
||
|
|
Date: Thu, 16 May 2024 15:30:37 +0200
|
||
|
|
Subject: [PATCH 5/7] Revert "11-dm-lvm.rules: don't restore
|
||
|
|
DM_UDEV_DISABLE_OTHER_RULES_FLAG from db"
|
||
|
|
|
||
|
|
This reverts commit 2b2f11a74cd5cc05f266fd0c65f0e55eb8bafd9f.
|
||
|
|
---
|
||
|
|
udev/11-dm-lvm.rules.in | 13 ++++++++-----
|
||
|
|
1 file changed, 8 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/udev/11-dm-lvm.rules.in b/udev/11-dm-lvm.rules.in
|
||
|
|
index 5b0cc5242..5f04ab329 100644
|
||
|
|
--- a/udev/11-dm-lvm.rules.in
|
||
|
|
+++ b/udev/11-dm-lvm.rules.in
|
||
|
|
@@ -26,11 +26,14 @@ IMPORT{program}="(DM_EXEC)/dmsetup splitname --nameprefixes --noheadings --rows
|
||
|
|
# to zero any stale metadata found within the LV data area. Such stale
|
||
|
|
# metadata could cause false claim of the LV device, keeping it open etc.
|
||
|
|
#
|
||
|
|
-# If the NOSCAN flag is present, set DM_UDEV_DISABLE_OTHER_RULES_FLAG
|
||
|
|
-# so those selected rules are surely skipped.
|
||
|
|
-# We don't need to save and restore the previous of DM_UDEV_DISABLE_OTHER_RULES_FLAG,
|
||
|
|
-# that's taken care of in 10-dm.rules.
|
||
|
|
-ENV{DM_SUBSYSTEM_UDEV_FLAG0}=="1", ENV{DM_NOSCAN}="1", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}="1"
|
||
|
|
+# If the NOSCAN flag is present, backup selected existing flags used to
|
||
|
|
+# disable rules, then set them firmly so those selected rules are surely skipped.
|
||
|
|
+# Restore these flags once the NOSCAN flag is dropped (which is normally any
|
||
|
|
+# uevent that follows for this LV, even an artificially generated one).
|
||
|
|
+ENV{DM_SUBSYSTEM_UDEV_FLAG0}=="1", ENV{DM_NOSCAN}="1", ENV{DM_DISABLE_OTHER_RULES_FLAG_OLD}="$env{DM_UDEV_DISABLE_OTHER_RULES_FLAG}", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}="1"
|
||
|
|
+ENV{DM_SUBSYSTEM_UDEV_FLAG0}!="1", IMPORT{db}="DM_NOSCAN", IMPORT{db}="DM_DISABLE_OTHER_RULES_FLAG_OLD"
|
||
|
|
+ENV{DM_SUBSYSTEM_UDEV_FLAG0}!="1", ENV{DM_NOSCAN}=="1", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}="$env{DM_DISABLE_OTHER_RULES_FLAG_OLD}", \
|
||
|
|
+ ENV{DM_DISABLE_OTHER_RULES_FLAG_OLD}="", ENV{DM_NOSCAN}=""
|
||
|
|
|
||
|
|
ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}=="1", GOTO="lvm_end"
|
||
|
|
|
||
|
|
--
|
||
|
|
2.44.0
|
||
|
|
|