From: Bastian Krause Date: Fri, 11 Jun 2021 14:21:03 +0200 Subject: [PATCH] autotools/systemd: call rpcbind with -w only on enabled warm starts 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. Forwarded: https://lore.kernel.org/linux-nfs/20210611122803.24747-1-bst@pengutronix.de/ Signed-off-by: Bastian Krause --- configure.ac | 6 ++++++ systemd/rpcbind.service.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c0ef8967f5eb..c2069a2b3b0e 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 7b1c74bf4261..c892ca86b0d2 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