[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.1rc1-141-gcdb2b90

[markus (none)]

The following commit has been merged in the upstream branch:
commit 2c21faec04f0029bfef381dfa4341a916ee28967
Author: markus <markus at AVA-351181.(none)>
Date:   Tue Aug 3 14:42:01 2010 -0700

    Fix for #4300 Solaris svc files need new pid filenames
    
    The conf/solaris/smf/svc-puppetd and svc-puppetmasterd still used
    puppetd.pid and puppetmasterd.pid for stopping the services in 2.6.0.
    These are changed to agent.pid and master.pid for 2.6.1.

diff --git a/conf/solaris/smf/svc-puppetd b/conf/solaris/smf/svc-puppetd
index 9036b50..b6cf057 100755
--- a/conf/solaris/smf/svc-puppetd
+++ b/conf/solaris/smf/svc-puppetd
@@ -12,7 +12,7 @@ exec_prefix=/opt/csw
 sysconfdir=/opt/csw/etc
 sbindir=/opt/csw/sbin
 
-pidfile=/var/lib/puppet/run/puppetd.pid
+pidfile=/var/lib/puppet/run/agent.pid
 
 case "$1" in
 start)
diff --git a/conf/solaris/smf/svc-puppetmasterd b/conf/solaris/smf/svc-puppetmasterd
index 34f5a62..80e3d46 100755
--- a/conf/solaris/smf/svc-puppetmasterd
+++ b/conf/solaris/smf/svc-puppetmasterd
@@ -8,7 +8,7 @@ exec_prefix=/opt/csw
 sysconfdir=/opt/csw/etc
 sbindir=/opt/csw/sbin
 
-pidfile=/var/lib/puppet/run/puppetmasterd.pid
+pidfile=/var/lib/puppet/run/master.pid
 
 case "$1" in
 start)

-- 
Puppet packaging for Debian