On Thu, Apr 04, 2024 at 07:38:11PM +0200, Martin Wilck wrote:
> We don't need to restore DM_NOSCAN from the db anymore, so we can rename
> it to .DM_NOSCAN, making it a temporary property.
>
> Signed-off-by: Martin Wilck <mwilck@xxxxxxxx>
> ---
> multipath/11-dm-mpath.rules.in | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/multipath/11-dm-mpath.rules.in b/multipath/11-dm-mpath.rules.in
> index efc6416..ec55435 100644
> --- a/multipath/11-dm-mpath.rules.in
> +++ b/multipath/11-dm-mpath.rules.in
> @@ -96,14 +96,14 @@ ENV{MPATH_DEVICE_READY}!="0", GOTO="mpath_is_ready"
> # Do not initiate scanning if no path is available,
> # otherwise there would be a hang or IO error on access.
> # We'd like to avoid this, especially within udev processing.
> -# This is communicated to later rules in DM_NOSCAN.
> +# This is communicated to later rules in .DM_NOSCAN.
> # Likewise, skip all foreign rules if no path is available.
> # Use DM_UDEV_DISABLE_OTHER_RULES_FLAG to communicate this
> # to upper layers. With dm rules < v3, save the original value here;
> # it will be restored in a late udev rule.
> ENV{DM_UDEV_RULES_VSN}=="1|2", \
> ENV{.MPATH_SAVE_DISABLE_OTHER_RULES_FLAG}="$env{DM_UDEV_DISABLE_OTHER_RULES_FLAG}"
> -ENV{DM_NOSCAN}="1", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}="1"
> +ENV{.DM_NOSCAN}="1", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}="1"
> GOTO="dont_activate"
>
> LABEL="mpath_is_ready"
> @@ -134,7 +134,7 @@ ENV{DM_UDEV_PRIMARY_SOURCE_FLAG}!="1", GOTO="import_end"
> ENV{DM_UDEV_RULES_VSN}!="1|2", GOTO="import_end"
>
> # Don't import the properties from db if we will run blkid later.
> -ENV{DM_NOSCAN}!="1", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}!="1", GOTO="import_end"
> +ENV{.DM_NOSCAN}!="1", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}!="1", GOTO="import_end"
>
> IMPORT{db}="ID_FS_TYPE"
> IMPORT{db}="ID_FS_USAGE"
> @@ -150,6 +150,9 @@ LABEL="import_end"
> # Reset previous DM_COLDPLUG_SUSPENDED if activation happens now
> ENV{.DM_SUSPENDED}!="1", ENV{DM_ACTIVATION}=="1", ENV{DM_COLDPLUG_SUSPENDED}=""
>
> +# device-mapper rules v2 compatibility for 13-dm-disk.rules
> +ENV{DM_UDEV_RULES_VSN}!="3", ENV{DM_NOSCAN}="$env{.DM_NOSCAN}"
> +
You missed a DM_UDEV_RULES_VSN change here.
-Ben
> # Multipath maps should take precedence over their members.
> ENV{DM_UDEV_LOW_PRIORITY_FLAG}!="1", OPTIONS+="link_priority=50"
>
> --
> 2.44.0
