From: Ken Dreyer <kdreyer@redhat.com>
Date: Tue, 19 Jan 2016 16:53:45 +0000 (-0700)
Subject: init-ceph.in: skip ceph-disk if it is not present
X-Git-Tag: v10.1.0~307^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7dd9af0a21e0ab0ae397faf901231ad0a9688ab9;p=ceph.git

init-ceph.in: skip ceph-disk if it is not present

With the ceph-mon vs ceph-osd split packaging, users are expected to
have the ceph-mon package installed and not ceph-osd (and vice versa).
However, the init script (/etc/init.d/ceph) has a call to `ceph-disk`,
which may not be present on the machine.

Given that our packaging is not yet split upstream, this bug does not
manifest itself currently, because both ceph-mon and ceph-disk are
currently in the same "ceph" package. Once we split the packaging,
though, this will become an issue.

http://tracker.ceph.com/issues/10587 Refs: #10587

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
---

diff --git a/src/init-ceph.in b/src/init-ceph.in
index 9d4fc71ea27a..97472bee4ee5 100755
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -533,7 +533,9 @@ done
 # activate latent osds?
 if [ "$command" = "start" -a "$BINDIR" != "." ]; then
     if [ "$*" = "" ] || echo $* | grep -q ^osd\$ ; then
-	ceph-disk activate-all
+       if [ -x $SBINDIR/ceph-disk ]; then
+           ceph-disk activate-all
+       fi
     fi
 fi