- updated to 0.56

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

diff --git a/ceph.logrotate.patch b/ceph.logrotate.patch
index 1cdb7d1bc7d12eec49d7a9e0970ac4be9a8fd305..e869408c1d681891f3eccae4a227016377646fb0 100644 (file)
--- a/ceph.logrotate.patch
+++ b/ceph.logrotate.patch
@@ -1,11 +1,27 @@
---- 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.56/src/logrotate.conf.orig  2013-01-06 13:46:50.321379068 +0100
++++ ceph-0.56/src/logrotate.conf       2013-01-06 14:46:15.021304770 +0100
+@@ -4,23 +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 && [ -x `which invoke-rc.d` ]; then
+-            invoke-rc.d ceph reload >/dev/null
+-        elif which service > /dev/null && [ -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
+-            # upstart reload isn't very helpful here:
+-            #   https://bugs.launchpad.net/upstart/+bug/1012938
+-            for type in mon osd mds; do
+-              initctl list \
+-                  | perl -ne 'print "$+{service} cluster=$+{cluster} id=$+{id}\n" if m{^(?<service>ceph-(mon|osd|mds)+)\s+\((?<cluster>[^/)]+)/(?<id>[^)]+)\) start/}' \
+-                  | while read l; do
+-                  initctl reload -- $l 2>/dev/null || :
+-              done
+-            done
+-        fi
++        service ceph reload >/dev/null 2>/dev/null
+     endscript
+     missingok
+ }