diff options
| author | Bastian Krause <bst@pengutronix.de> | 2022-07-12 16:07:10 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2022-07-12 16:07:10 -0400 |
| commit | 9380891e54040bb0f9c150b81d254c3aa3f32b33 (patch) | |
| tree | 817d8b6d03f1826e160a1176f3c89369ff51ec05 | |
| parent | 1e00cd123044661fd4f921d1e7216ed9255bb3d1 (diff) | |
| download | rpcbind-master.tar.gz | |
autotools/systemd: call rpcbind with -w only on enabled warm startsHEADrpcbind-1_2_7-rc2master
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>
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | systemd/rpcbind.service.in | 2 |
2 files changed, 7 insertions, 1 deletions
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 |