2021-06-11 12:31:28

by Bastian Krause

Subject: [PATCH rpcbind] 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.

Signed-off-by: Bastian Krause <[email protected]>
---
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
--
2.29.2

2022-07-06 10:14:37

by Bastian Krause

Subject: Re: [PATCH rpcbind] autotools/systemd: call rpcbind with -w only on enabled warm starts

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 <[email protected]>

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 |

2022-07-12 20:41:36

by Steve Dickson

Subject: Re: [PATCH rpcbind] autotools/systemd: call rpcbind with -w only on enabled warm starts

On 6/11/21 7:28 AM, 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 <[email protected]>
This did fall of my radar... In the future feel free
to ping me privately...

Committed! (tag rpcbind-1_2_7-rc2)

steved.
> ---
> 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