File puppet-3.0.2-init.patch of Package puppet

Overview Repositories Revisions Requests Users Attributes Meta

File puppet-3.0.2-init.patch of Package puppet (Revision e5bdf76197dd7d04a286b9202ea57cee)

Currently displaying revision e5bdf76197dd7d04a286b9202ea57cee , Show latest

Index: ext/suse/client.init
===================================================================
--- ext/suse/client.init.orig
+++ ext/suse/client.init
@@ -33,13 +33,11 @@
 #      rc_exit          exit appropriate to overall rc status
 [ -f /etc/rc.status ] && . /etc/rc.status
 [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet
-lockfile=${LOCKFILE-/var/lock/subsys/puppet}
-pidfile=${PIDFILE-/var/run/puppet/agent.pid}
 puppetd=${PUPPETD-/usr/bin/puppet}
 RETVAL=0
 
 PUPPET_OPTS="agent"
-[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="--server=${PUPPET_SERVER}"
+[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="${PUPPET_OPTS} --server=${PUPPET_SERVER}"
 [ -n "$PUPPET_LOG" ] && PUPPET_OPTS="${PUPPET_OPTS} --logdest=${PUPPET_LOG}"
 [ -n "$PUPPET_PORT" ] && PUPPET_OPTS="${PUPPET_OPTS} --port=${PUPPET_PORT}"
 
@@ -68,7 +66,7 @@ case "$1" in
 
         # startproc should return 0, even if service is
         # already running to match LSB spec.
-        startproc -p ${pidfile} $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} && touch ${lockfile}
+        startproc $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} 
         # Remember status and be verbose
         rc_status -v
         ;;
@@ -77,7 +75,7 @@ case "$1" in
         ## Stop daemon with killproc(8) and if this fails
         ## set echo the echo return value.
 
-        killproc -QUIT -p ${pidfile} $puppetd && rm -f ${lockfile} ${pidfile}
+        killproc -QUIT $puppetd 
 
         # Remember status and be verbose
         rc_status -v
@@ -106,7 +104,7 @@ case "$1" in
 
         echo -n "Reload service puppet"
         ## if it supports it:
-        killproc -HUP -p ${pidfile} $puppetd
+        killproc -HUP $puppetd
         rc_status -v
         ;;
     reload)
@@ -115,7 +113,7 @@ case "$1" in
 
         # If it supports signalling:
         echo -n "Reload puppet services."
-        killproc -HUP -p ${pidfile} $puppetd
+        killproc -HUP $puppetd
         rc_status -v
         ;;
     status)
@@ -130,7 +128,7 @@ case "$1" in
         # 3 - service not running
 
         # NOTE: checkproc returns LSB compliant status values.
-        checkproc -p ${pidfile} $puppetd
+        checkproc $puppetd
         rc_status -v
         ;;
     once)
Index: ext/suse/server.init
===================================================================
--- ext/suse/server.init.orig
+++ ext/suse/server.init
@@ -30,9 +30,6 @@
 #      rc_reset         clear local rc status (overall remains)
 #      rc_exit          exit appropriate to overall rc status
 
-lockfile=/var/lock/subsys/puppetmaster
-pidfile=/var/run/puppet/master.pid
-
 # Source function library.
 [ -f /etc/rc.status ] && . /etc/rc.status
 
@@ -97,7 +94,7 @@ case "$1" in
         # already running to match LSB spec.
         # Confirm the manifest exists
         if [ -r $PUPPETMASTER_MANIFEST ]; then
-            startproc -p ${pidfile} $PUPPETMASTER $PUPPETMASTER_OPTS && touch "$lockfile"
+            startproc $PUPPETMASTER $PUPPETMASTER_OPTS
         else
             rc_failed
             echo "Manifest does not exist: $PUPPETMASTER_MANIFEST"
@@ -110,7 +107,7 @@ case "$1" in
         ## Stop daemon with killproc(8) and if this fails
         ## set echo the echo return value.
 
-        killproc -QUIT -p ${pidfile} $PUPPETMASTER && rm -f ${lockfile} ${pidfile}
+        killproc -QUIT $PUPPETMASTER
 
         # Remember status and be verbose
         rc_status -v
@@ -139,7 +136,7 @@ case "$1" in
 
         echo -n "Reload service puppet"
         ## if it supports it:
-        killproc -HUP -p ${pidfile} $PUPPETMASTER
+        killproc -HUP $PUPPETMASTER
         rc_status -v
         ;;
     reload)
@@ -148,7 +145,7 @@ case "$1" in
 
         # If it supports signalling:
         echo -n "Reload puppet services."
-        killproc -HUP -p ${pidfile} $PUPPETMASTER
+        killproc -HUP $PUPPETMASTER
         rc_status -v
         ;;
     status)
@@ -163,7 +160,7 @@ case "$1" in
         # 3 - service not running
 
         # NOTE: checkproc returns LSB compliant status values.
-        checkproc -p ${pidfile} $PUPPETMASTER
+        checkproc $PUPPETMASTER
         rc_status -v
         ;;
     *)

Places

File puppet-3.0.2-init.patch of Package puppet (Revision e5bdf76197dd7d04a286b9202ea57cee)

Places