summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.com>2016-11-28 15:33:34 -0500
committerSteve Dickson <steved@redhat.com>2016-11-28 15:33:34 -0500
commit5739ac63458348f7bcb8f315e20b478ddbb1bb6e (patch)
tree912eaea3a6a3e74e9428d4f34ff6be8d52aebf35
parent2e78e6fb51292fea798355e5cb749dbc1de26ca6 (diff)
downloadrpcbind-5739ac63458348f7bcb8f315e20b478ddbb1bb6e.tar.gz
Fix path for rpcbind in rpcbind.servicerpcbind-0_2_4-rc3
Due to a miscommunication, Commit: 0cc39c519278 ("Provide systemd unit files for rpcbind") used sbindir as the location of rpcbind to put in the systemd unit file instead of bindir, which is where rpcbind gets installed. So change those few instances of sbindir to bindir so that the unit file will have the correct path. Signed-off-by: NeilBrown <neilb@suse.com> Signed-off-by: Steve Dickson <steved@redhat.com>
-rw-r--r--configure.ac6
-rw-r--r--systemd/rpcbind.service.in2
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index acc6914..f34f669 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,9 +61,9 @@ AC_SEARCH_LIBS([pthread_create], [pthread])
AC_CHECK_HEADERS([nss.h rpcsvc/mount.h])
-# make sbindir available for substitution in config file
+# make bindir available for substitution in config file
# 2 "evals" needed to expand variable names
-AC_SUBST([_sbindir])
-AC_CONFIG_COMMANDS_PRE([eval eval _sbindir=$sbindir])
+AC_SUBST([_bindir])
+AC_CONFIG_COMMANDS_PRE([eval eval _bindir=$bindir])
AC_OUTPUT([Makefile systemd/rpcbind.service])
diff --git a/systemd/rpcbind.service.in b/systemd/rpcbind.service.in
index c173b83..e7e86da 100644
--- a/systemd/rpcbind.service.in
+++ b/systemd/rpcbind.service.in
@@ -11,7 +11,7 @@ After=rpcbind.socket
[Service]
Type=notify
# distro can provide a drop-in adding EnvironmentFile=-/??? if needed.
-ExecStart=@_sbindir@/rpcbind $RPCBIND_OPTIONS -w -f
+ExecStart=@_bindir@/rpcbind $RPCBIND_OPTIONS -w -f
[Install]
WantedBy=multi-user.target