- updated to 0.56

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

diff --git a/ceph.logrotate.patch b/ceph.logrotate.patch
index 640372dd30f2b3b1b5709d0ca5c5f8580348cba8..e869408c1d681891f3eccae4a227016377646fb0 100644 (file)
--- a/ceph.logrotate.patch
+++ b/ceph.logrotate.patch
@@ -1,14 +1,16 @@
---- ceph-0.54/src/logrotate.conf.orig  2012-11-15 21:05:38.519614603 +0100
-+++ ceph-0.54/src/logrotate.conf       2012-11-15 21:09:14.862943424 +0100
-@@ -4,21 +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
--        if [ -x `which invoke-rc.d` ]; then
+-        if which invoke-rc.d > /dev/null && [ -x `which invoke-rc.d` ]; then
 -            invoke-rc.d ceph reload >/dev/null
--        elif [ -x `which service` ]; then
+-        elif which service > /dev/null && [ -x `which service` ]; then
 -            service ceph reload >/dev/null
--        elif [ -x `which initctl` ]; then
+-        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
@@ -19,7 +21,7 @@
 -              done
 -            done
 -        fi
-+            service ceph reload >/dev/null 2>/dev/null
++        service ceph reload >/dev/null 2>/dev/null
      endscript
      missingok
  }