* [PATCH v3] dracut: Verify multipath config_dir option
@ 2020-02-04 5:12 Milan P. Gandhi
2020-02-04 6:06 ` Dracut GitHub Import Bot
2020-02-04 7:51 ` Martin Wilck
0 siblings, 2 replies; 3+ messages in thread
From: Milan P. Gandhi @ 2020-02-04 5:12 UTC (permalink / raw)
To: initramfs-u79uwXL29TY76Z2rM5mHXA
Cc: mwilck-IBi9RG/b67k, harald-H+wXaHxf7aLQT0dZR+AlfA
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 v3:
- Removed awk/sed usage to get config_dir path
- Added a check to verify if path specifed with
config_dir is actual directory
- Used derror to report invalid config_dir path
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..2f6d1f7a 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
+ derror "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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v3] dracut: Verify multipath config_dir option
2020-02-04 5:12 [PATCH v3] dracut: Verify multipath config_dir option Milan P. Gandhi
@ 2020-02-04 6:06 ` Dracut GitHub Import Bot
2020-02-04 7:51 ` Martin Wilck
1 sibling, 0 replies; 3+ messages in thread
From: Dracut GitHub Import Bot @ 2020-02-04 6:06 UTC (permalink / raw)
To: initramfs-u79uwXL29TY76Z2rM5mHXA
Patchset imported to github.
Pull request:
<https://github.com/dracutdevs/dracut/compare/master...dracut-mailing-devs:20200204051243.GA7871%40machine1>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] dracut: Verify multipath config_dir option
2020-02-04 5:12 [PATCH v3] dracut: Verify multipath config_dir option Milan P. Gandhi
2020-02-04 6:06 ` Dracut GitHub Import Bot
@ 2020-02-04 7:51 ` Martin Wilck
1 sibling, 0 replies; 3+ messages in thread
From: Martin Wilck @ 2020-02-04 7:51 UTC (permalink / raw)
To: Milan P. Gandhi, initramfs-u79uwXL29TY76Z2rM5mHXA
Cc: harald-H+wXaHxf7aLQT0dZR+AlfA
On Tue, 2020-02-04 at 10:42 +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 v3:
> - Removed awk/sed usage to get config_dir path
> - Added a check to verify if path specifed with
> config_dir is actual directory
> - Used derror to report invalid config_dir path
>
> modules.d/90multipath/module-setup.sh | 16 +++++++++++++++-
> 1 file changed, 15 insertions(+), 1 deletion(-)
Reviewed-by: Martin Wilck <mwilck-IBi9RG/b67k@public.gmane.org>
>
> diff --git a/modules.d/90multipath/module-setup.sh
> b/modules.d/90multipath/module-setup.sh
> index 48a9d09a..2f6d1f7a 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
> + derror "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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-04 7:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-04 5:12 [PATCH v3] dracut: Verify multipath config_dir option Milan P. Gandhi
2020-02-04 6:06 ` Dracut GitHub Import Bot
2020-02-04 7:51 ` Martin Wilck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox