Fixed init.d issue again, bug #237712. Added ldap and rrdtool USE flags, bug #237717.

Package-Manager: portage-2.2_rc9/cvs/Linux 2.6.26-gentoo-r1 x86_64

2 files changed, 29 insertions, 26 deletions

diff --git a/app-admin/puppet/files/puppet.init b/app-admin/puppet/files/puppet.init
index 019b51680ac7..e909f88aa6e7 100755
--- a/app-admin/puppet/files/puppet.init
+++ b/app-admin/puppet/files/puppet.init
@@ -1,38 +1,40 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/files/puppet.init,v 1.1 2008/09/09 09:20:05 matsuu Exp $
 
 depend() {
-        need net
-        use dns logger
+	need net
+	use dns logger
 }
 
 checkconfig() {
-        if [[ ! -d "${PUPPET_PID_DIR}" ]] ; then
-               eerror "Please make sure PUPPET_PID_DIR is defined and points to a existing directory"
-               return 1
-        fi
+	if [[ ! -d "${PUPPET_PID_DIR}" ]] ; then
+		eerror "Please make sure PUPPET_PID_DIR is defined and points to a existing directory"
+		return 1
+	fi
 
-        return 0
+	return 0
 }
 
 start() {
-        checkconfig || return $?
+	checkconfig || return $?
 
-        local options=""
-        [[ -n "${PUPPET_EXTRA_OPTS}" ]] && options="${options} ${PUPPET_EXTRA_OPTS}"
+	local options=""
+	[[ -n "${PUPPET_EXTRA_OPTS}" ]] && options="${options} ${PUPPET_EXTRA_OPTS}"
 
-        ebegin "Starting puppet"
-        start-stop-daemon --start --quiet --exec /usr/bin/puppetd -- ${options}
-        eend $? "Failed to start puppet"
+	ebegin "Starting puppet"
+	start-stop-daemon --start --quiet \
+		--pidfile "${PUPPET_PID_DIR}/puppetd.pid" \
+		--exec /usr/bin/puppetd -- ${options}
+	eend $? "Failed to start puppet"
 }
 
 stop() {
-        ebegin "Stopping puppet"
-        start-stop-daemon --stop --quiet --pidfile ${PUPPET_PID_DIR}/puppetd.pid
-        local ret=$?
-        eend ${ret} "Failed to stop puppet"
-        rm -f ${PUPPET_PID_DIR}/puppetd.pid
-        return ${ret}
+	ebegin "Stopping puppet"
+	start-stop-daemon --stop --quiet \
+		--pidfile "${PUPPET_PID_DIR}/puppetd.pid"
+	local ret=$?
+	eend ${ret} "Failed to stop puppet"
+	rm -f "${PUPPET_PID_DIR}/puppetd.pid"
+	return ${ret}
 }
diff --git a/app-admin/puppet/files/puppetmaster.init b/app-admin/puppet/files/puppetmaster.init
index e5ff580f6758..4cc59794ba84 100755
--- a/app-admin/puppet/files/puppetmaster.init
+++ b/app-admin/puppet/files/puppetmaster.init
@@ -4,6 +4,7 @@
 
 depend() {
 	need net
+	after slapd
 	before puppet
 	use dns logger
 }
@@ -34,18 +35,18 @@ start() {
 	[[ -n "${PUPPETMASTER_EXTRA_OPTS}" ]] && options="${options} ${PUPPETMASTER_EXTRA_OPTS}"
 
 	ebegin "Starting puppetmaster"
-	start-stop-daemon --start --quiet --exec /usr/bin/puppetmasterd \
-		-- ${options}
+	start-stop-daemon --start --quiet \
+		--pidfile "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid" \
+		--exec /usr/bin/puppetmasterd -- ${options}
 	eend $? "Failed to start puppetmaster"
 }
 
 stop() {
 	ebegin "Stopping puppetmaster"
 	start-stop-daemon --stop --quiet \
-		--pidfile ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
+		--pidfile "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid"
 	local ret=$?
 	eend ${ret} "Failed to stop puppetmaster"
-	rm -f ${PUPPETMASTER_PID_DIR}/puppetmasterd.pid
+	rm -f "${PUPPETMASTER_PID_DIR}/puppetmasterd.pid"
 	return ${ret}
 }
-