]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Use sysV init script directly
authorOwen Synge <osynge@suse.com>
Tue, 3 Feb 2015 16:58:09 +0000 (17:58 +0100)
committerNathan Cutler <ncutler@suse.cz>
Mon, 20 Apr 2015 13:08:13 +0000 (15:08 +0200)
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)
(cherry picked from commit 11fa95c34e26ee9462498ec68d24e95001744b08)

src/ceph-disk

index 956b8f7aede545af38492592d064852e6b0ba593..e420598ce15f44629f2ff968e307f0cf246d1679 100755 (executable)
@@ -2049,14 +2049,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',