diff options
| author | Rahul <rahul@puppetlabs.com> | 2012-07-12 17:59:51 -0700 |
|---|---|---|
| committer | rahul <rahul@pe-solaris11-vm.(none)> | 2012-07-20 05:22:32 -0700 |
| commit | 0eab4c1ba0ec05e10165ecb9588420fb4b9783a7 (patch) | |
| tree | 872cc22970d1b493d11a4d1cf42c2e29c2f01527 /conf | |
| parent | a578b65f1d730f34c697f161ed1d70409703fb87 (diff) | |
| download | puppet-0eab4c1ba0ec05e10165ecb9588420fb4b9783a7.tar.gz | |
12465 : update the service to use its own pid at /var/run/puppet.pid
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/redhat/client.init | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/conf/redhat/client.init b/conf/redhat/client.init index 7efea2df0..44d4b4f8c 100644 --- a/conf/redhat/client.init +++ b/conf/redhat/client.init @@ -14,9 +14,8 @@ PATH=/usr/bin:/sbin:/bin:/usr/sbin export PATH [ -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} +pidfile=${PIDFILE-/var/run/puppet.pid} +puppetd=${PUPPETD-/usr/sbin/puppetd} RETVAL=0 # Source function library. @@ -41,11 +40,9 @@ fi start() { echo -n $"Starting puppet agent: " - daemon $daemonopts $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} + daemon $daemonopts "nohup $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --no-daemonize >/dev/null 2>&1 & echo \$! > $pidfile" RETVAL=$? echo - [ $RETVAL = 0 ] && touch ${lockfile} - return $RETVAL } stop() { @@ -53,7 +50,7 @@ stop() { killproc $pidopts $puppetd RETVAL=$? echo - [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile} + [ $RETVAL = 0 ] && rm -f ${pidfile} } reload() { @@ -107,7 +104,7 @@ case "$1" in once) shift $puppetd ${PUPPET_OPTS} --onetime ${PUPPET_EXTRA_OPTS} $@ - ;; + ;; genconfig) genconfig ;; |