Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <81c6a673-3bd3-387a-a4cc-0a96cc0ab4b4@redhat.com>
Date:   Mon, 27 Jun 2022 10:35:50 -0400
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.10.0
Subject: Re: [PATCH nfs-utils] configure: make modprobe.d directory
 configurable.
Content-Language: en-US
To:     NeilBrown <neilb@suse.de>
Cc:     linux-nfs <linux-nfs@vger.kernel.org>
References: <165594889671.4786.9612372524810600367@noble.neil.brown.name>
From:   Steve Dickson <steved@redhat.com>
In-Reply-To: <165594889671.4786.9612372524810600367@noble.neil.brown.name>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 6/22/22 9:48 PM, NeilBrown wrote:
> 
> Debian seems to prefer /lib/modprobe.d - at lease sometimes.
> 
> So allow
>    ./configure --with-modprobedir=/lib/modprobe.d
> to work, but default to /usr/lib/modprobe.d
> 
> Signed-off-by: NeilBrown <neilb@suse.de>
Committed... (tag: nfs-utils-2-6-2-rc8)

steved.

> ---
>   configure.ac        | 12 ++++++++++++
>   systemd/Makefile.am |  6 ++++--
>   2 files changed, 16 insertions(+), 2 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index a13f36915a35..4403335bcaa9 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -71,6 +71,18 @@ AC_ARG_WITH(systemd,
>   	AM_CONDITIONAL(INSTALL_SYSTEMD, [test "$use_systemd" = 1])
>   	AC_SUBST(unitdir)
>   
> +modprobedir=/usr/lib/modprobe.d
> +AC_ARG_WITH(modprobedir,
> +	[AS_HELP_STRING([--with-modprobedir@<:@=modprobe-dir-path@:>@],[install modprobe config files @<:@Default: /usr/lib/modprobe.d@:>@])],
> +	if test "$withval" != "no" ; then
> +		modprobedir=$withval
> +	else
> +		modprobedir=
> +	fi
> +	)
> +	AM_CONDITIONAL(INSTALL_MODPROBEDIR, [test -n "$modprobedir"])
> +	AC_SUBST(modprobedir)
> +
>   AC_ARG_ENABLE(nfsv4,
>   	[AS_HELP_STRING([--disable-nfsv4],[disable support for NFSv4 @<:@default=no@:>@])],
>   	enable_nfsv4=$enableval,
> diff --git a/systemd/Makefile.am b/systemd/Makefile.am
> index 63a50bf2c07e..7b5ab84bd793 100644
> --- a/systemd/Makefile.am
> +++ b/systemd/Makefile.am
> @@ -82,5 +82,7 @@ install-data-hook: $(unit_files) $(modprobe_files)
>   else
>   install-data-hook: $(modprobe_files)
>   endif
> -	mkdir -p $(DESTDIR)/usr/lib/modprobe.d
> -	cp $(modprobe_files) $(DESTDIR)/usr/lib/modprobe.d/
> +if INSTALL_MODPROBEDIR
> +	mkdir -p $(DESTDIR)$(modprobedir)
> +	cp $(modprobe_files) $(DESTDIR)$(modprobedir)
> +endif