logrotate: use cephctl, so it works with systemd

diff --git a/ceph.logrotate.patch b/ceph.logrotate.patch
index 74bbca96b7bf8f767cc899e6a0a50ce9bd82b7f5..6da864cabe3e4e8cbb5bd049eef7c32609018c6e 100644 (file)
--- a/ceph.logrotate.patch
+++ b/ceph.logrotate.patch
@@ -23,7 +23,7 @@
 -                  done
 -            done
 -        fi
-+        service ceph reload >/dev/null 2>/dev/null
++        cephctl reload >/dev/null 2>/dev/null
      endscript
      missingok
      notifempty

diff --git a/cephctl b/cephctl
index 3fb1d6109ce286981c12a45d3751d607c53e187e..fce0240ad75b8bd64a2bdbe618826c84f80d3f4f 100644 (file)
--- a/cephctl
+++ b/cephctl
@@ -3,6 +3,8 @@
 # It seems this was designed as /etc/init.d/ceph script for controlling the systemd
 # units on SuSE, made into 'cephctl' for PLD
 
+systemd_booted 2>/dev/null || exec /etc/rc.d/init.d/ceph "$@"
+
 action=$1 ; shift
 [ -f /etc/sysconfig/ceph ] && . /etc/sysconfig/ceph
 cluster=${CLUSTER:-ceph}