- updated to 0.59

[packages/ceph.git] / ceph.logrotate.patch

diff --git a/ceph.logrotate.patch b/ceph.logrotate.patch
index 1cdb7d1bc7d12eec49d7a9e0970ac4be9a8fd305..6bddd00f1bbb1cec8781754cdf5634966ea9ed33 100644 (file)
--- a/ceph.logrotate.patch
+++ b/ceph.logrotate.patch
@@ -1,11 +1,25 @@
---- src/logrotate.conf 2012-07-03 00:22:59.000000000 -0400
-+++ src/logrotate.conf.new     2012-09-09 12:56:09.912929358 -0400
-@@ -4,7 +4,7 @@
+--- ceph-0.58/src/logrotate.conf.orig  2013-03-08 22:30:48.205300063 +0100
++++ ceph-0.58/src/logrotate.conf       2013-03-08 22:31:18.038632150 +0100
+@@ -4,21 +4,7 @@
      compress
      sharedscripts
      postrotate
--        invoke-rc.d ceph reload >/dev/null || service ceph reload >/dev/null
-+        service ceph reload >/dev/null 2>/dev/null || true
- 
-       # upstart reload isn't very helpful here:
-       #   https://bugs.launchpad.net/upstart/+bug/1012938
+-        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 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 2>&1 && [ -x `which initctl` ]; then
+-            # upstart reload isn't very helpful here:
+-            #   https://bugs.launchpad.net/upstart/+bug/1012938
+-          initctl list \
+-              | sed -n 's/^\(ceph-\(mon\|osd\|mds\)\+\)[ \t]\+(\([^ \/]\+\)\/\([^ \/]\+\))[ \t]\+start\/.*$/\1 cluster=\3 id=\4/p' \
+-              | while read l; do
+-              initctl reload -- $l 2>/dev/null || :
+-          done
+-        fi
++        service ceph reload >/dev/null 2>/dev/null
+     endscript
+     missingok
+ }