From: Owen Synge <osynge@suse.com>
Date: Tue, 3 Feb 2015 16:58:09 +0000 (+0100)
Subject: Use sysV init script directly
X-Git-Tag: SES1-maint01~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=89921b4c995372cbea575dfb237ad4b3472c4a62;p=ceph.git

Use sysV init script directly

ceph-disk:SLE11sp3 /sbin/service cannot take paramteres that start with '--'
so use the init script directly.

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit fff38a0f18d1986f63a31e26d2b84749adab88af)
---

diff --git a/src/ceph-disk b/src/ceph-disk
index fb12b9b34af8..5c7959f37693 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -1862,14 +1862,9 @@ def start_daemon(
                     ],
                 )
         elif os.path.exists(os.path.join(path, 'sysvinit')):
-            if os.path.exists('/usr/sbin/service'):
-                svc = '/usr/sbin/service'
-            else:
-                svc = '/sbin/service'
             command_check_call(
                 [
-                    svc,
-                    'ceph',
+                    '/etc/init.d/ceph',
                     '--cluster',
                     '{cluster}'.format(cluster=cluster),
                     'start',