[Pkg-puppet-devel] Bug#574677: puppetmaster init stop fails if daemon is not running

[Mathias Gug]

Package: puppet
Version: 0.25.4-2
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu lucid ubuntu-patch


*** /tmp/tmpijiw5c
In Ubuntu, we've applied the attached patch to achieve the following:

  * debian/puppetmaster.init: Fix init stop action to not fail if the
    puppetmaster is already stopped. 

We thought you might be interested in doing the same. 


-- System Information:
Debian Release: squeeze/sid
  APT prefers lucid-updates
  APT policy: (500, 'lucid-updates'), (500, 'lucid-security'), (500, 'lucid')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.24-25-server (SMP w/2 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash
-------------- next part --------------

=== modified file 'debian/puppetmaster.init'
--- debian/puppetmaster.init	2010-03-11 12:42:32 +0000
+++ debian/puppetmaster.init	2010-03-20 02:22:10 +0000
@@ -62,13 +62,13 @@
 	NUMSTART=0
 	STOPPORT=$PORT
 	while [ $NUMSTART -lt $PUPPETMASTERS ]; do 
-	    start-stop-daemon --stop --quiet --pidfile /var/run/puppet/${NAME}-${STOPPORT}.pid
+	    start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/puppet/${NAME}-${STOPPORT}.pid
 	    rm -f /var/run/puppet/${NAME}-${STOPPORT}.pid
 	    STOPPORT=$(($STOPPORT + 1))
 	    NUMSTART=$(($NUMSTART + 1))
 	done
     else
-	start-stop-daemon --stop --quiet --pidfile /var/run/puppet/${NAME}.pid
+	start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/puppet/${NAME}.pid
     fi
 }