Mattias Saou ran into a serious bug cause by 9dff71 (Use -p option to
killproc).  The puppetmaster init script lacked a pidfile variable,
which ended up with /usr/sbin/puppetmasterd being removed.
---

This patch is of the brown paper bag variety.  It's an embarrassing
oversight on my part and I deserve a few good lumps for breaking this
between rc2 and release.  I'm sorry about that. :(

I pushed this fix to the tickets/0.25.x/2751 branch at
git://jet.mox.net/~tmz/puppet.git, as it's a fix on top of the bug I
added there.

 conf/redhat/server.init |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/conf/redhat/server.init b/conf/redhat/server.init
index 5505058..4f44206 100644
--- a/conf/redhat/server.init
+++ b/conf/redhat/server.init
@@ -13,6 +13,7 @@ PATH=/usr/bin:/sbin:/bin:/usr/sbin
 export PATH
 
 lockfile=/var/lock/subsys/puppetmaster
+pidfile=/var/run/puppet/puppetmasterd.pid
 
 # Source function library.
 . /etc/rc.d/init.d/functions
-- 
1.6.5.2

-- 
Todd        OpenPGP -> KeyID: 0xBEAF0CE3 | URL: www.pobox.com/~tmz/pgp
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Man is a rational animal who always loses his temper when he is called
upon to act in accordance with the dictates of reason.
    -- Oscar Wilde

Attachment: pgp91WgBCqMUb.pgp
Description: PGP signature

Reply via email to