]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-disk: tolerate /sbin/service or /usr/sbin/service
authorSage Weil <sage@inktank.com>
Tue, 30 Apr 2013 21:16:04 +0000 (14:16 -0700)
committerSage Weil <sage@inktank.com>
Tue, 30 Apr 2013 21:16:04 +0000 (14:16 -0700)
CentOS/RH has it in /sbin, others in /usr/sbin.

Backport: bobtail
Signed-off-by: Sage Weil <sage@inktank.com>
src/ceph-disk

index 8694ee1eefaf524a61c0909033acc120652a7df7..f1380be87016b8cda4035fdbdacdddfe843543b6 100755 (executable)
@@ -1311,9 +1311,13 @@ 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'
             subprocess.check_call(
                 args=[
-                    '/usr/sbin/service',
+                    svc,
                     'ceph',
                     'start',
                     'osd.{osd_id}'.format(osd_id=osd_id),