On 3/1/24 23:40, Martin Wilck wrote:
> DM_NOSCAN is not an official API any more and doesn't have to be
> restored from the udev db. Rename it to .DM_NOSCAN.
>
> Signed-off-by: Martin Wilck <mwilck@xxxxxxxx>
> ---
> 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 0b77fe2..d0a5637 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 cb2ce2d..7989871 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"
Yup, the DM_NOSCAN is internal and we don't need to import that for
subsequent events.
(Well, it's still used in 13-dm-disk.rules, but that's at least in our
hands.)
--
Peter
