From 2c21faec04f0029bfef381dfa4341a916ee28967 Mon Sep 17 00:00:00 2001 From: markus Date: Tue, 3 Aug 2010 14:42:01 -0700 Subject: 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. --- conf/solaris/smf/svc-puppetd | 2 +- conf/solaris/smf/svc-puppetmasterd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/solaris/smf/svc-puppetd b/conf/solaris/smf/svc-puppetd index 9036b505c..b6cf05736 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 34f5a62e6..80e3d464a 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) -- cgit