[PATCH v2] dracut: Verify multipath config_dir option

[PATCH v2] dracut: Verify multipath config_dir option

[Milan P. Gandhi]

The 90multipath/module-setup.sh file currently does not check the
dm-multipath config_dir option. This option in multipath.conf file is
used to specify a custom directory/path that contains the multipath
configuration files. It's default value is /etc/multipath/conf.d

Currently install function of module-setup.sh has hardcoded the above
path, but users could change it with config_dir option. So, adding
steps to read the path specified with config_dir option and add
these configuration files to the initial ram disk image.

Signed-off-by: Milan P. Gandhi <mgandhi-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---

changes v2:
 - Removed awk/sed usage to get config_dir path
 - Added a check to verify if path specifed with
   config_dir is actual directory

 modules.d/90multipath/module-setup.sh | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
index 48a9d09a..7609ff52 100755
--- a/modules.d/90multipath/module-setup.sh
+++ b/modules.d/90multipath/module-setup.sh
@@ -79,6 +79,20 @@ install() {
         }
     }
 
+    # Include multipath configuration files from path specified with config_dir
+    while read _k _v; do
+        if [[ "$_k" = config_dir ]]; then
+            _v=${_v#\"}
+            config_dir=${_v%\"}
+        fi
+    done < <(/sbin/multipath -t)
+
+    if [ -d "$config_dir" ]; then
+        config_dir+="/*"
+    else
+        echo "multipath.conf: config_dir - No such directory $config_dir"
+    fi
+
     inst_multiple -o  \
         dmsetup \
         kpartx \
@@ -91,7 +105,7 @@ install() {
         /etc/xdrdevices.conf \
         /etc/multipath.conf \
         /etc/multipath/* \
-        /etc/multipath/conf.d/*
+        $config_dir
 
     [[ $hostonly ]] && [[ $hostonly_mode = "strict" ]] && {
         for_each_host_dev_and_slaves_all add_hostonly_mpath_conf
-- 
2.20.1

Re: [PATCH v2] dracut: Verify multipath config_dir option

[Dracut GitHub Import Bot]

Patchset imported to github.
Pull request:
<https://github.com/dracutdevs/dracut/compare/master...dracut-mailing-devs:20200203113034.GA19959%40machine1>

Re: [PATCH v2] dracut: Verify multipath config_dir option

[Martin Wilck]

On Mon, 2020-02-03 at 17:00 +0530, Milan P. Gandhi wrote:
> The 90multipath/module-setup.sh file currently does not check the
> dm-multipath config_dir option. This option in multipath.conf file is
> used to specify a custom directory/path that contains the multipath
> configuration files. It's default value is /etc/multipath/conf.d
> 
> Currently install function of module-setup.sh has hardcoded the above
> path, but users could change it with config_dir option. So, adding
> steps to read the path specified with config_dir option and add
> these configuration files to the initial ram disk image.
> 
> Signed-off-by: Milan P. Gandhi <mgandhi-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> ---
> 
> changes v2:
>  - Removed awk/sed usage to get config_dir path
>  - Added a check to verify if path specifed with
>    config_dir is actual directory
> 
>  modules.d/90multipath/module-setup.sh | 16 +++++++++++++++-
>  1 file changed, 15 insertions(+), 1 deletion(-)
> 
> diff --git a/modules.d/90multipath/module-setup.sh
> b/modules.d/90multipath/module-setup.sh
> index 48a9d09a..7609ff52 100755
> --- a/modules.d/90multipath/module-setup.sh
> +++ b/modules.d/90multipath/module-setup.sh
> @@ -79,6 +79,20 @@ install() {
>          }
>      }
>  
> +    # Include multipath configuration files from path specified with
> config_dir
> +    while read _k _v; do
> +        if [[ "$_k" = config_dir ]]; then
> +            _v=${_v#\"}
> +            config_dir=${_v%\"}
> +        fi
> +    done < <(/sbin/multipath -t)
> +
> +    if [ -d "$config_dir" ]; then
> +        config_dir+="/*"
> +    else
> +        echo "multipath.conf: config_dir - No such directory
> $config_dir"

I believe new code should use derror or dwarning here instead of plain
echo. Otherwise, it's looking good.

Martin

Re: [PATCH v2] dracut: Verify multipath config_dir option

[Milan P. Gandhi]

On 2/3/20 6:29 PM, Martin Wilck wrote:
> On Mon, 2020-02-03 at 17:00 +0530, Milan P. Gandhi wrote:
>> The 90multipath/module-setup.sh file currently does not check the
>> dm-multipath config_dir option. This option in multipath.conf file is
>> used to specify a custom directory/path that contains the multipath
>> configuration files. It's default value is /etc/multipath/conf.d
>>
>> Currently install function of module-setup.sh has hardcoded the above
>> path, but users could change it with config_dir option. So, adding
>> steps to read the path specified with config_dir option and add
>> these configuration files to the initial ram disk image.
>>
>> Signed-off-by: Milan P. Gandhi <mgandhi-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
>> ---
>>
>> changes v2:
>>  - Removed awk/sed usage to get config_dir path
>>  - Added a check to verify if path specifed with
>>    config_dir is actual directory
>>
>>  modules.d/90multipath/module-setup.sh | 16 +++++++++++++++-
>>  1 file changed, 15 insertions(+), 1 deletion(-)
>>
>> diff --git a/modules.d/90multipath/module-setup.sh
>> b/modules.d/90multipath/module-setup.sh
>> index 48a9d09a..7609ff52 100755
>> --- a/modules.d/90multipath/module-setup.sh
>> +++ b/modules.d/90multipath/module-setup.sh
>> @@ -79,6 +79,20 @@ install() {
>>          }
>>      }
>>  
>> +    # Include multipath configuration files from path specified with
>> config_dir
>> +    while read _k _v; do
>> +        if [[ "$_k" = config_dir ]]; then
>> +            _v=${_v#\"}
>> +            config_dir=${_v%\"}
>> +        fi
>> +    done < <(/sbin/multipath -t)
>> +
>> +    if [ -d "$config_dir" ]; then
>> +        config_dir+="/*"
>> +    else
>> +        echo "multipath.conf: config_dir - No such directory
>> $config_dir"
> 
> I believe new code should use derror or dwarning here instead of plain
> echo. Otherwise, it's looking good.
Sure, I will update it.

Thanks,
Milan.