From: Sage Weil <sage@inktank.com>
Date: Tue, 30 Apr 2013 21:16:04 +0000 (-0700)
Subject: ceph-disk: tolerate /sbin/service or /usr/sbin/service
X-Git-Tag: v0.61~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cd1d6fb3f9b906f13cf281294d9272e1e92a0243;p=ceph.git

ceph-disk: tolerate /sbin/service or /usr/sbin/service

CentOS/RH has it in /sbin, others in /usr/sbin.

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

diff --git a/src/ceph-disk b/src/ceph-disk
index 8694ee1eefaf..f1380be87016 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -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),