[ceph/el6] - actually add new patch

Josef Bacik josef at fedoraproject.org
Fri Mar 29 20:45:30 UTC 2013


commit 15e2e4694fee3b677bea260cda1c5059802cae2c
Author: Josef Bacik <josef at toxicpanda.com>
Date:   Fri Mar 29 16:45:14 2013 -0400

    - actually add new patch

 0001-silence-logrotate-some-more.patch |   41 ++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 deletions(-)
---
diff --git a/0001-silence-logrotate-some-more.patch b/0001-silence-logrotate-some-more.patch
new file mode 100644
index 0000000..0d448c8
--- /dev/null
+++ b/0001-silence-logrotate-some-more.patch
@@ -0,0 +1,41 @@
+From d02340d90c9d30d44c962bea7171db3fe3bfba8e Mon Sep 17 00:00:00 2001
+From: Alexandre Oliva <oliva at gnu.org>
+Date: Wed, 6 Feb 2013 15:27:13 -0200
+Subject: [PATCH] silence logrotate some more
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+I was getting email with logrotate error output from “which invoke-rc.d”
+on systems without an invoke-rc.d.  This patch silences it.
+
+Silence stderr from which when running logrotate
+
+From: Alexandre Oliva <oliva at gnu.org>
+
+Signed-off-by: Alexandre Oliva <oliva at gnu.org>
+---
+ src/logrotate.conf |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/logrotate.conf b/src/logrotate.conf
+index 62101b3..e49285a 100644
+--- a/src/logrotate.conf
++++ b/src/logrotate.conf
+@@ -4,13 +4,13 @@
+     compress
+     sharedscripts
+     postrotate
+-        if which invoke-rc.d > /dev/null && [ -x `which invoke-rc.d` ]; then
++        if which invoke-rc.d > /dev/null 2>&1 && [ -x `which invoke-rc.d` ]; then
+             invoke-rc.d ceph reload >/dev/null
+-        elif which service > /dev/null && [ -x `which service` ]; then
++        elif which service > /dev/null 2>&1 && [ -x `which service` ]; then
+             service ceph reload >/dev/null
+         fi
+         # Possibly reload twice, but depending on ceph.conf the reload above may be a no-op
+-        if which initctl > /dev/null && [ -x `which initctl` ]; then
++        if which initctl > /dev/null 2>&1 && [ -x `which initctl` ]; then
+             # upstart reload isn't very helpful here:
+             #   https://bugs.launchpad.net/upstart/+bug/1012938
+             for type in mon osd mds; do


More information about the scm-commits mailing list