summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-10-14 11:22:40 +1100
committerJames Turnbull <james@lovedthanlost.net>2008-10-14 11:22:40 +1100
commit7f5ded185269cabeb7921c4f4739e1f66a34d54d (patch)
treec10d16cf97f8431668679fe59ad17a7ae718d819
parent00d5fe403d754e61ae32f01f6879dfc93bfa6111 (diff)
downloadpuppet-7f5ded185269cabeb7921c4f4739e1f66a34d54d.tar.gz
puppet-7f5ded185269cabeb7921c4f4739e1f66a34d54d.tar.xz
puppet-7f5ded185269cabeb7921c4f4739e1f66a34d54d.zip
Fixed #1646 - service puppet status does not work as non-root on redhat system
-rw-r--r--CHANGELOG3
-rw-r--r--conf/redhat/client.init2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 4699dd133..b4704761a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,7 @@
0.24.6
+ Fixed #1646 - service puppet status does not work as non-root
+ on redhat system
+
Fixed #1649 - Updated OSX package cleanup
Fixed #1647 - puppetdoc -r providers now working again
diff --git a/conf/redhat/client.init b/conf/redhat/client.init
index c3cb91e90..44caab140 100644
--- a/conf/redhat/client.init
+++ b/conf/redhat/client.init
@@ -84,7 +84,7 @@ case "$1" in
[ -f "$pidfile" ] && restart
;;
status)
- status $puppetd
+ status -p "$pidfile" $puppetd
RETVAL=$?
;;
once)