From: Wido den Hollander <wido@widodh.nl>
Date: Tue, 28 Feb 2012 11:41:42 +0000 (+0100)
Subject: init: Actually do start the daemons when 'service ceph start <type>' is specified
X-Git-Tag: v0.43~5
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=97926e184629d25b3dbf57eda66b65c28ff29e02;p=ceph.git

init: Actually do start the daemons when 'service ceph start <type>' is specified

A bug in my previous patch prevented any daemon with auto_start set to false from starting.

This patch allows:
* /etc/init.d/ceph start osd|mds|mon
* service ceph start osd|mds|mon

It however does not start daemons if auto_start is disabled when you invoke:
* /etc/init.d/ceph start
* service ceph start

Signed-off-by: Wido den Hollander <wido@widodh.nl>
---

diff --git a/src/init-ceph.in b/src/init-ceph.in
index 80d3784b6bb6f..e2bd569e8080d 100644
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -187,8 +187,10 @@ for name in $what; do
     if [ "$command" = "start" ]; then
         get_conf auto_start "" "auto start"
         if [ "$auto_start" = "no" ] || [ "$auto_start" = "false" ] || [ "$auto_start" = "0" ]; then
-            echo "Skipping Ceph $name on $host... auto start is disabled"
-            continue
+            if [ -z "$@" ]; then
+                echo "Skipping Ceph $name on $host... auto start is disabled"
+                continue
+            fi
         fi
 
 	if daemon_is_running $name ceph-$type $id $pid_file; then