| Message ID | 20220812003653.53992-1-miguel.bernal.marin@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ed56d6053c532f43a8bbd109a87e754a43def845 |
| Headers | show |
| Series | [ndctl] meson: fix modprobedatadir default value | expand |
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>
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)
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(-)