>From 01e065b86cdb33c722d0973bf285791d18f48609 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 20 Jun 2013 10:12:00 -0400 Subject: [PATCH 1/2] 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 --- configure.ac | 4 +++- src/sysv/SUSE/{sssd => sssd.in} | 5 ++--- src/sysv/gentoo/{sssd => sssd.in} | 4 ++-- src/sysv/{sssd => sssd.in} | 7 +++---- 4 files changed, 10 insertions(+), 10 deletions(-) rename src/sysv/SUSE/{sssd => sssd.in} (96%) rename src/sysv/gentoo/{sssd => sssd.in} (59%) rename src/sysv/{sssd => sssd.in} (96%) diff --git a/configure.ac b/configure.ac index 70671ae7c7d51ca26285c9012800c4ca2642cee8..df6037567a1ffe1e95fa18862e24a0ab012aa4f2 100644 --- a/configure.ac +++ b/configure.ac @@ -276,7 +276,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 similarity index 96% rename from src/sysv/SUSE/sssd rename to src/sysv/SUSE/sssd.in index 2f98c21646aa5ceea334f1201d0b0a194f79735b..04d3023131da66e5324fa72aa4115c35d2914aef 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 similarity index 59% rename from src/sysv/gentoo/sssd rename to src/sysv/gentoo/sssd.in index cbaedfd5dcc1b52757acb50fe529a49b323ec673..8007b644ad651ea91882b2b1dccdd283d0cae263 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 similarity index 96% rename from src/sysv/sssd rename to src/sysv/sssd.in index ca929e9ec62d179fc35d22b915d5ca965d515edd..8a344be7f37daf9a916550758599570ef5c2d81c 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 $? - -- 1.8.3.1