summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2013-06-20 10:12:00 -0400
committerJakub Hrozek <jhrozek@redhat.com>2013-06-21 00:07:26 +0200
commite0ade8d1e00d577686f893e0059def5866dcb9f6 (patch)
treebd2538512704abb2f373123e9aec166d883d37e0
parent7d9e5527237b1a779b4cb464f64eae72c3a2162d (diff)
downloadsssd-e0ade8d1e00d577686f893e0059def5866dcb9f6.tar.gz
sssd-e0ade8d1e00d577686f893e0059def5866dcb9f6.tar.xz
sssd-e0ade8d1e00d577686f893e0059def5866dcb9f6.zip
Configure SYSV init scripts properly
Previously, these contained hard-coded paths. Now they are populated correctly by the configure script. https://fedorahosted.org/sssd/ticket/1986
-rw-r--r--configure.ac4
-rw-r--r--src/sysv/SUSE/sssd.in (renamed from src/sysv/SUSE/sssd)5
-rw-r--r--src/sysv/gentoo/sssd.in (renamed from src/sysv/gentoo/sssd)4
-rw-r--r--src/sysv/sssd.in (renamed from src/sysv/sssd)7
4 files changed, 10 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index 7eeee2e2a..3417ba877 100644
--- a/configure.ac
+++ b/configure.ac
@@ -285,7 +285,9 @@ AC_DEFINE_UNQUOTED([ABS_BUILD_DIR], ["$abs_build_dir"], [Absolute path to the bu
AC_SUBST([abs_builddir], $abs_build_dir)
AC_CONFIG_FILES([Makefile contrib/sssd.spec src/examples/rwtab src/doxy.config
- src/sysv/systemd/sssd.service po/Makefile.in src/man/Makefile
+ src/sysv/systemd/sssd.service src/sysv/sssd
+ src/sysv/gentoo/sssd src/sysv/SUSE/sssd
+ po/Makefile.in src/man/Makefile
src/providers/ipa/ipa_hbac.pc src/providers/ipa/ipa_hbac.doxy
src/lib/idmap/sss_idmap.pc src/lib/idmap/sss_idmap.doxy
src/sss_client/sudo/sss_sudo.doxy
diff --git a/src/sysv/SUSE/sssd b/src/sysv/SUSE/sssd.in
index 2f98c2164..04d302313 100644
--- a/src/sysv/SUSE/sssd
+++ b/src/sysv/SUSE/sssd.in
@@ -23,8 +23,8 @@ prog="sssd"
. /etc/rc.status
rc_reset
-SSSD=/usr/sbin/sssd
-PID_FILE=/var/run/sssd.pid
+SSSD=@sbindir@/sssd
+PID_FILE=@localstatedir@/run/sssd.pid
case "$1" in
start)
@@ -75,4 +75,3 @@ case "$1" in
exit 1
esac
rc_exit
-
diff --git a/src/sysv/gentoo/sssd b/src/sysv/gentoo/sssd.in
index cbaedfd5d..8007b644a 100644
--- a/src/sysv/gentoo/sssd
+++ b/src/sysv/gentoo/sssd.in
@@ -7,12 +7,12 @@ depend(){
start(){
ebegin "Starting sssd"
- start-stop-daemon --start --exec /usr/sbin/sssd -- -D
+ start-stop-daemon --start --exec @sbindir@/sssd -- -D
eend ${?}
}
stop(){
ebegin "Stopping sssd"
- start-stop-daemon --stop --pidfile /var/run/sssd.pid
+ start-stop-daemon --stop --pidfile @localstatedir@/run/sssd.pid
eend ${?}
}
diff --git a/src/sysv/sssd b/src/sysv/sssd.in
index ca929e9ec..8a344be7f 100644
--- a/src/sysv/sssd
+++ b/src/sysv/sssd.in
@@ -31,10 +31,10 @@ prog="sssd"
# Source function library.
. /etc/init.d/functions
-SSSD=/usr/sbin/sssd
+SSSD=@sbindir@/sssd
-LOCK_FILE=/var/lock/subsys/sssd
-PID_FILE=/var/run/sssd.pid
+LOCK_FILE=@localstatedir@/lock/subsys/sssd
+PID_FILE=@localstatedir@/run/sssd.pid
start() {
[ -x $SSSD ] || exit 5
@@ -127,4 +127,3 @@ case "$1" in
exit 2
esac
exit $?
-