From 25d90f94fa71e613b8dd7ce389671fe88ac3db8b Mon Sep 17 00:00:00 2001 From: Benoit Gschwind Date: Mon, 12 Mar 2018 14:38:04 +0000 Subject: [PATCH] fix rpcbind.service warmstart flags When warmstart is disable the -w flag must be removed from rpcbind.service --- configure.ac | 4 ++++ systemd/rpcbind.service.in | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 359a418..6abcf4f 100644 --- a/configure.ac +++ b/configure.ac @@ -20,6 +20,10 @@ 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) +if test x"$enable_warmstarts" = xyes; then +AC_SUBST([rpcbind_warmstart_flags], [-w]) +fi + AC_ARG_WITH([statedir], AS_HELP_STRING([--with-statedir=ARG], [use ARG as state dir @<:@default=/var/run/rpcbind@:>@]) diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in index 7b1c74b..40c1ae0 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=@_bindir@/rpcbind $RPCBIND_OPTIONS -w -f +ExecStart=@_bindir@/rpcbind $RPCBIND_OPTIONS @rpcbind_warmstart_flags@ -f [Install] WantedBy=multi-user.target -- 2.16.1