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: <82f7edc0-c9d4-6a9a-1360-1b6e5b2f1d59@pengutronix.de>
Date:   Wed, 6 Jul 2022 12:11:04 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.9.0
Subject: Re: [PATCH rpcbind] autotools/systemd: call rpcbind with -w only on
 enabled warm starts
Content-Language: en-US
To:     linux-nfs@vger.kernel.org
Cc:     Steve Dickson <steved@redhat.com>, kernel@pengutronix.de
References: <20210611122803.24747-1-bst@pengutronix.de>
From:   Bastian Krause <bst@pengutronix.de>
In-Reply-To: <20210611122803.24747-1-bst@pengutronix.de>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 6/11/21 14:28, Bastian Krause wrote:
> If rpcbind is configured with --disable-warmstarts it responds on -w
> with its usage string. This is not helpful in a systemd service, so pass
> -w conditionally.
> 
> Signed-off-by: Bastian Krause <bst@pengutronix.de>

Gentle ping!

Regards,
Bastian

> ---
>   configure.ac               | 6 ++++++
>   systemd/rpcbind.service.in | 2 +-
>   2 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/configure.ac b/configure.ac
> index c0ef896..c2069a2 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -20,6 +20,12 @@ AM_CONDITIONAL(LIBSETDEBUG, test x$lib_setdebug = xyes)
>   AC_ARG_ENABLE([warmstarts],
>     AS_HELP_STRING([--enable-warmstarts], [Enables Warm Starts @<:@default=no@:>@]))
>   AM_CONDITIONAL(WARMSTART, test x$enable_warmstarts = xyes)
> +AS_IF([test x$enable_warmstarts = xyes], [
> +	warmstarts_opt=-w
> +], [
> +	warmstarts_opt=
> +])
> +AC_SUBST([warmstarts_opt], [$warmstarts_opt])
>   
>   AC_ARG_ENABLE([rmtcalls],
>     AS_HELP_STRING([--enable-rmtcalls], [Enables Remote Calls @<:@default=no@:>@]))
> diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
> index 7b1c74b..c892ca8 100644
> --- a/systemd/rpcbind.service.in
> +++ b/systemd/rpcbind.service.in
> @@ -12,7 +12,7 @@ Wants=rpcbind.target
>   [Service]
>   Type=notify
>   # distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
> -ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS -w -f
> +ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS @warmstarts_opt@ -f
>   
>   [Install]
>   WantedBy=multi-user.target


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |