From: Sage Weil <sage@inktank.com>
Date: Wed, 13 Feb 2013 23:49:42 +0000 (-0800)
Subject: ceph-disk-activate: specify full path for blkid, initctl, service
X-Git-Tag: v0.58~51^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f06b45e66315310abb0720e021da377186455048;p=ceph.git

ceph-disk-activate: specify full path for blkid, initctl, service

/sbin apparently isn't in the path when udev runs us.

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

diff --git a/src/ceph-disk-activate b/src/ceph-disk-activate
index 18c33ef3d3d..13c83cec864 100755
--- a/src/ceph-disk-activate
+++ b/src/ceph-disk-activate
@@ -297,7 +297,7 @@ def start_daemon(
     if os.path.exists(os.path.join(path,'upstart')):
         subprocess.check_call(
             args=[
-                'initctl',
+                '/sbin/initctl',
                 # use emit, not start, because start would fail if the
                 # instance was already running
                 'emit',
@@ -314,7 +314,7 @@ def start_daemon(
     elif os.path.exists(os.path.join(path, 'sysvinit')):
         subprocess.check_call(
             args=[
-                'service',
+                '/usr/sbin/service',
                 'ceph',
                 'start',
                 'osd.{osd_id}'.format(osd_id=osd_id),
@@ -331,7 +331,7 @@ def detect_fstype(
     ):
     fstype = _check_output(
         args=[
-            'blkid',
+            '/sbin/blkid',
             # we don't want stale cached results
             '-p',
             '-s', 'TYPE',