- rel 2; fix build with new boost

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

diff --git a/ceph.logrotate.patch b/ceph.logrotate.patch
index e869408c1d681891f3eccae4a227016377646fb0..6da864cabe3e4e8cbb5bd049eef7c32609018c6e 100644 (file)
--- a/ceph.logrotate.patch
+++ b/ceph.logrotate.patch
@@ -1,27 +1,29 @@
---- 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 @@
+--- 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
--        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
--            # 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
+-        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
-+        service ceph reload >/dev/null 2>/dev/null
++        cephctl reload >/dev/null 2>/dev/null
      endscript
      missingok
- }
+     notifempty