diff options
author | Jeroen van Meeuwen <kanarip@fedoraproject.org> | 2009-11-26 07:06:34 +0000 |
---|---|---|
committer | Jeroen van Meeuwen <kanarip@fedoraproject.org> | 2009-11-26 07:06:34 +0000 |
commit | c5e32e36ad326f9d9d171364e57ee5b797e258c2 (patch) | |
tree | 5ea8758540b54f94bf4d808aec035a930578fd90 /puppet-0.24.8-status-options.patch | |
parent | 7c3cf558aa909b1388cdca3cbc9f8135aa1fda9a (diff) | |
download | puppet-package-c5e32e36ad326f9d9d171364e57ee5b797e258c2.tar.gz puppet-package-c5e32e36ad326f9d9d171364e57ee5b797e258c2.tar.xz puppet-package-c5e32e36ad326f9d9d171364e57ee5b797e258c2.zip |
0.25.1-1puppet-0_25_1-1_el4
Diffstat (limited to 'puppet-0.24.8-status-options.patch')
-rw-r--r-- | puppet-0.24.8-status-options.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/puppet-0.24.8-status-options.patch b/puppet-0.24.8-status-options.patch deleted file mode 100644 index aad9ee5..0000000 --- a/puppet-0.24.8-status-options.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ea04f2700ebdbac7c5abd263df1bbda9eee12097 Mon Sep 17 00:00:00 2001 -From: Todd Zullinger <tmz@pobox.com> -Date: Fri, 3 Jul 2009 09:08:17 -0400 -Subject: [PATCH/puppet 1/2] conf/redhat/client.init: Fix #2123, status options on older RHEL - -On RHEL < 5, the status function does not accept a -p option. Using it -causes 'service puppet status' to produce erroneous output. This was -also reported by Aaron Dummer in Red Hat bug #501577. ---- - conf/redhat/client.init | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/conf/redhat/client.init b/conf/redhat/client.init -index 44caab1..f40e81d 100644 ---- a/conf/redhat/client.init -+++ b/conf/redhat/client.init -@@ -62,6 +62,11 @@ restart() { - start - } - -+rh_status() { -+ status | grep -q -- '-p' 2>/dev/null && statusopts="-p $pidfile" -+ status $statusopts $puppetd -+} -+ - genconfig() { - echo -n $"Generate configuration puppet: " - $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig -@@ -84,8 +89,7 @@ case "$1" in - [ -f "$pidfile" ] && restart - ;; - status) -- status -p "$pidfile" $puppetd -- RETVAL=$? -+ rh_status - ;; - once) - shift --- -1.6.3.3 - |