summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-04-30 14:16:04 -0700
committerSage Weil <sage@inktank.com>2013-04-30 14:16:04 -0700
commitcd1d6fb3f9b906f13cf281294d9272e1e92a0243 (patch)
tree98255c4af13fde76e63215bd5a9a253a26c9c2f7
parentc2bcc2a60c2c1f66c757c01ed6bcc6778821f81d (diff)
downloadceph-cd1d6fb3f9b906f13cf281294d9272e1e92a0243.tar.gz
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>
-rwxr-xr-xsrc/ceph-disk6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ceph-disk b/src/ceph-disk
index 8694ee1eefa..f1380be8701 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),