- rel 2; fix build with new boost

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

diff --git a/ceph.logrotate.patch b/ceph.logrotate.patch
index 6ded86e616ae7bdcea1fc34082e25604609c8759..6da864cabe3e4e8cbb5bd049eef7c32609018c6e 100644 (file)
--- a/ceph.logrotate.patch
+++ b/ceph.logrotate.patch
@@ -1,11 +1,29 @@
---- ./src/logrotate.conf.new   2012-01-11 18:23:10.597593501 -0500
-+++ ./src/logrotate.conf       2012-01-11 18:23:26.808390838 -0500
-@@ -4,7 +4,7 @@
+--- ceph-0.84/src/logrotate.conf.orig  2014-08-22 19:12:40.945575009 +0200
++++ ceph-0.84/src/logrotate.conf       2014-08-22 19:14:59.222235873 +0200
+@@ -4,25 +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
+-        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
+-            for daemon in osd mon mds ; do
+-              find -L /var/lib/ceph/$daemon/ -mindepth 1 -maxdepth 1 -regextype posix-egrep -regex '.*/[A-Za-z0-9]+-[A-Za-z0-9._-]+' -printf '%P\n' \
+-                | while read f; do
+-                    if [ -e "/var/lib/ceph/$daemon/$f/done" -o -e "/var/lib/ceph/$daemon/$f/ready" ] && [ -e "/var/lib/ceph/$daemon/$f/upstart" ] && [ ! -e "/var/lib/ceph/$daemon/$f/sysvinit" ]; then
+-                      cluster="${f%%-*}"
+-                      id="${f#*-}"
+-
+-                      initctl reload ceph-$daemon cluster="$cluster" id="$id" 2>/dev/null || :
+-                    fi
+-                  done
+-            done
+-        fi
++        cephctl reload >/dev/null 2>/dev/null
      endscript
      missingok
- }
+     notifempty