From da6319b9f5d263a210cf51b471fdbf1c343facf3 Mon Sep 17 00:00:00 2001 From: Marian Csontos Date: Thu, 16 May 2024 15:30:15 +0200 Subject: [PATCH 3/7] Revert "dm udev rules: don't export and save DM_NOSCAN" This reverts commit a196752969320cfc34a97cc97afa1978fa57da73. --- udev/11-dm-lvm.rules.in | 2 +- udev/13-dm-disk.rules.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/udev/11-dm-lvm.rules.in b/udev/11-dm-lvm.rules.in index cfc022489..5b0cc5242 100644 --- a/udev/11-dm-lvm.rules.in +++ b/udev/11-dm-lvm.rules.in @@ -30,7 +30,7 @@ IMPORT{program}="(DM_EXEC)/dmsetup splitname --nameprefixes --noheadings --rows # 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" +ENV{DM_SUBSYSTEM_UDEV_FLAG0}=="1", ENV{DM_NOSCAN}="1", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}="1" ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}=="1", GOTO="lvm_end" diff --git a/udev/13-dm-disk.rules.in b/udev/13-dm-disk.rules.in index b53bb62de..b748cc909 100644 --- a/udev/13-dm-disk.rules.in +++ b/udev/13-dm-disk.rules.in @@ -18,9 +18,9 @@ SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}" ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}" ENV{.DM_SUSPENDED}=="1", ENV{DM_UDEV_PRIMARY_SOURCE_FLAG}=="1", GOTO="dm_import" -ENV{.DM_NOSCAN}=="1", ENV{DM_UDEV_PRIMARY_SOURCE_FLAG}=="1", GOTO="dm_import" +ENV{DM_NOSCAN}=="1", ENV{DM_UDEV_PRIMARY_SOURCE_FLAG}=="1", GOTO="dm_import" ENV{.DM_SUSPENDED}=="1", GOTO="dm_end" -ENV{.DM_NOSCAN}=="1", GOTO="dm_watch" +ENV{DM_NOSCAN}=="1", GOTO="dm_watch" (BLKID_RULE) GOTO="dm_link" -- 2.44.0