diff options
| author | Wido den Hollander <wido@widodh.nl> | 2012-02-28 12:41:42 +0100 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2012-02-28 09:10:52 -0800 |
| commit | 97926e184629d25b3dbf57eda66b65c28ff29e02 (patch) | |
| tree | f9955986b55abc0311eb906750a289bfeb5c5411 | |
| parent | 1917024134e2cb9f82665e7e5c6e090c1f4acfe3 (diff) | |
| download | ceph-97926e184629d25b3dbf57eda66b65c28ff29e02.tar.gz | |
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>
| -rw-r--r-- | src/init-ceph.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/init-ceph.in b/src/init-ceph.in index 80d3784b6bb..e2bd569e808 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 |