From: Sage Weil <sage@inktank.com>
Date: Sat, 26 Jan 2013 06:52:03 +0000 (-0800)
Subject: init-ceph: consider sysvinit-tagged dirs as local
X-Git-Tag: v0.58~78^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b8aa4769a62e0d88174678cbefd89d9ee2baceea;p=ceph.git

init-ceph: consider sysvinit-tagged dirs as local

If there is a 'sysvinit' file in the daemon directory in the default
location (/var/lib/ceph/$type/ceph-$id), consider it sysvinit-managed.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/ceph_common.sh b/src/ceph_common.sh
index b66b1de3a53..9231b09c4af 100644
--- a/src/ceph_common.sh
+++ b/src/ceph_common.sh
@@ -45,6 +45,13 @@ check_host() {
 
     #echo host for $name is $host, i am $hostname
 
+    # sysvinit managed instance in standird location?
+    if [ -e "/var/lib/ceph/$type/ceph-$id/sysvinit" ]; then
+	host="$hostname"
+	echo "=== $type.$id === "
+	return 0
+    fi
+
     # ignore all sections without 'host' defined
     if [ -z "$host" ]; then
 	return 1