From: Sage Weil <sage@inktank.com>
Date: Fri, 15 Feb 2013 01:05:32 +0000 (-0800)
Subject: ceph-disk-activate: use full paths for everything
X-Git-Tag: v0.56.5~5^2~66
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=34fba357ca8b662c7b943d426ed37875c173003f;p=ceph.git

ceph-disk-activate: use full paths for everything

We are run from udev, which doesn't get a decent PATH.

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit b1c0fccba42dd184a2891ee873c0d6d8f8c79d14)
---

diff --git a/src/ceph-disk-activate b/src/ceph-disk-activate
index f4755f794a38..0b3548abbdd5 100755
--- a/src/ceph-disk-activate
+++ b/src/ceph-disk-activate
@@ -192,7 +192,7 @@ def allocate_osd_id(
     try:
         osd_id = _check_output(
             args=[
-                'ceph',
+                '/usr/bin/ceph',
                 '--cluster', cluster,
                 '--name', 'client.bootstrap-osd',
                 '--keyring', keyring,
@@ -217,7 +217,7 @@ def mkfs(
     monmap = os.path.join(path, 'activate.monmap')
     subprocess.check_call(
         args=[
-            'ceph',
+            '/usr/bin/ceph',
             '--cluster', cluster,
             '--name', 'client.bootstrap-osd',
             '--keyring', keyring,
@@ -227,7 +227,7 @@ def mkfs(
 
     subprocess.check_call(
         args=[
-            'ceph-osd',
+            '/usr/bin/ceph-osd',
             '--cluster', cluster,
             '--mkfs',
             '--mkkey',
@@ -251,7 +251,7 @@ def auth_key(
     ):
     subprocess.check_call(
         args=[
-            'ceph',
+            '/usr/bin/ceph',
             '--cluster', cluster,
             '--name', 'client.bootstrap-osd',
             '--keyring', keyring,
@@ -277,7 +277,7 @@ def move_mount(
     maybe_mkdir(osd_data)
     subprocess.check_call(
         args=[
-            'mount',
+            '/bin/mount',
             '--move',
             '--',
             path,
@@ -353,7 +353,7 @@ def get_conf(cluster, variable):
     try:
         p = subprocess.Popen(
             args=[
-                'ceph-conf',
+                '/usr/bin/ceph-conf',
                 '--cluster={cluster}'.format(
                     cluster=cluster,
                     ),
@@ -408,7 +408,7 @@ def mount(
     try:
         subprocess.check_call(
             args=[
-                'mount',
+                '/bin/mount',
                 '-o', options,
                 '--',
                 dev,
@@ -431,7 +431,7 @@ def unmount(
     try:
         subprocess.check_call(
             args=[
-                'umount',
+                '/bin/umount',
                 '--',
                 path,
                 ],