* [ndctl PATCH] meson: fix modprobedatadir default value
@ 2022-08-12 0:36 Miguel Bernal Marin
2022-08-12 0:52 ` Dan Williams
0 siblings, 1 reply; 2+ messages in thread
From: Miguel Bernal Marin @ 2022-08-12 0:36 UTC (permalink / raw)
To: nvdimm; +Cc: dan.j.williams, vishal.l.verma
The modprobedatadir is now set as a meson option, but without a
default value.
Set the default value if modprobedatadir is not set.
Fixes: 524ad09d5eda ("meson: make modprobedatadir an option")
Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>
---
contrib/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/meson.build b/contrib/meson.build
index ad63a50..48aa7c0 100644
--- a/contrib/meson.build
+++ b/contrib/meson.build
@@ -26,6 +26,6 @@ endif
modprobedatadir = get_option('modprobedatadir')
if modprobedatadir == ''
- modprobedatadir = get_option('modprobedatadir')
+ modprobedatadir = sysconfdir + '/modprobe.d/'
endif
install_data('nvdimm-security.conf', install_dir : modprobedatadir)
--
2.37.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* RE: [ndctl PATCH] meson: fix modprobedatadir default value
2022-08-12 0:36 [ndctl PATCH] meson: fix modprobedatadir default value Miguel Bernal Marin
@ 2022-08-12 0:52 ` Dan Williams
0 siblings, 0 replies; 2+ messages in thread
From: Dan Williams @ 2022-08-12 0:52 UTC (permalink / raw)
To: Miguel Bernal Marin, nvdimm; +Cc: dan.j.williams, vishal.l.verma
Miguel Bernal Marin wrote:
> The modprobedatadir is now set as a meson option, but without a
> default value.
>
> Set the default value if modprobedatadir is not set.
>
> Fixes: 524ad09d5eda ("meson: make modprobedatadir an option")
> Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>
> ---
> contrib/meson.build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/contrib/meson.build b/contrib/meson.build
> index ad63a50..48aa7c0 100644
> --- a/contrib/meson.build
> +++ b/contrib/meson.build
> @@ -26,6 +26,6 @@ endif
>
> modprobedatadir = get_option('modprobedatadir')
> if modprobedatadir == ''
> - modprobedatadir = get_option('modprobedatadir')
> + modprobedatadir = sysconfdir + '/modprobe.d/'
Looks good to me:
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-12 0:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-12 0:36 [ndctl PATCH] meson: fix modprobedatadir default value Miguel Bernal Marin
2022-08-12 0:52 ` Dan Williams
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).