[dm-devel] [PATCH v2 13/20] multipath -u: change output to environment/key format

[Benjamin Marzinski]

On Mon, Mar 19, 2018 at 04:01:48PM +0100, Martin Wilck wrote:
> ... instead of free format. This provides more flexibility
> for udev rule processing for the future. Adapt code in multipath.rules.
> The exit status remains as usual. This affects "multipath -c", too.

I assume that you meant to change the following code from
multipath/main.c: main() as well

        if (cmd == CMD_VALID_PATH &&
            dev_type == DEV_UEVENT) {
                int fd;

                fd = mpath_connect();
                if (fd == -1) {
                        condlog(3, "%s: daemon is not running", dev);
                        if (!systemd_service_enabled(dev)) {
                                printf("%s is not a valid "
                                       "multipath device path\n", dev);
                                goto out;
                        }
                } else  
                        mpath_disconnect(fd);
        }


> 
> Signed-off-by: Martin Wilck <mwilck at suse.com>
> ---
>  multipath/main.c          | 11 +++++------
>  multipath/multipath.rules |  6 +++---
>  2 files changed, 8 insertions(+), 9 deletions(-)
> 
> diff --git a/multipath/main.c b/multipath/main.c
> index ea4a3d44493a..f93cad2abde0 100644
> --- a/multipath/main.c
> +++ b/multipath/main.c
> @@ -350,15 +350,14 @@ out:
>  	return r;
>  }
>  
> -static void print_cmd_valid(const char *devpath, int k)
> +static void print_cmd_valid(int k)
>  {
> -	const char *msg[] = { "is", "is not" };
> +	int vals[] = { 1, 0 };
>  
> -	if (k < 0 || k >= sizeof(msg))
> +	if (k < 0 || k >= sizeof(vals))
>  		return;
>  
> -	printf("%s %s a valid multipath device path\n",
> -	       devpath, msg[k]);
> +	printf("DM_MULTIPATH_DEVICE_PATH=\"%d\"\n", vals[k]);
>  }
>  
>  /*
> @@ -520,7 +519,7 @@ configure (struct config *conf, enum mpath_cmds cmd,
>  
>  print_valid:
>  	if (cmd == CMD_VALID_PATH)
> -		print_cmd_valid(devpath, r);
> +		print_cmd_valid(r);
>  
>  out:
>  	if (refwwid)
> diff --git a/multipath/multipath.rules b/multipath/multipath.rules
> index 6f8ee2be0a58..aab64dc7182c 100644
> --- a/multipath/multipath.rules
> +++ b/multipath/multipath.rules
> @@ -19,9 +19,9 @@ LABEL="test_dev"
>  ENV{MPATH_SBIN_PATH}="/sbin"
>  TEST!="$env{MPATH_SBIN_PATH}/multipath", ENV{MPATH_SBIN_PATH}="/usr/sbin"
>  
> -ENV{DM_MULTIPATH_DEVICE_PATH}!="1", \
> -	PROGRAM=="$env{MPATH_SBIN_PATH}/multipath -u %k", \
> -	ENV{DM_MULTIPATH_DEVICE_PATH}="1", ENV{ID_FS_TYPE}="mpath_member", \
> +# multipath -u sets DM_MULTIPATH_DEVICE_PATH
> +ENV{DM_MULTIPATH_DEVICE_PATH}!="1", IMPORT{program}="$env{MPATH_SBIN_PATH}/multipath -u %k"
> +ENV{DM_MULTIPATH_DEVICE_PATH}=="1", ENV{ID_FS_TYPE}="mpath_member", \
>  	ENV{SYSTEMD_READY}="0"
>  
>  LABEL="end_mpath"
> -- 
> 2.16.1