From: Sage Weil <sage@redhat.com>
Date: Fri, 18 Sep 2015 15:40:26 +0000 (-0400)
Subject: ceph-osd-prestart.sh: no ceph-disk chown
X-Git-Tag: v9.1.0~119
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bf9c00580f7716fcaeff0631e16171180b2a792a;p=ceph.git

ceph-osd-prestart.sh: no ceph-disk chown

chown -R ceph:ceph $1 is easy enough.

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

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index e91ded961dba..92a220b94ab7 100644
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -37,7 +37,7 @@ Upgrading
       #. Fix the ownership.  E.g.,::
 
           chown -R ceph:ceph /var/lib/ceph/mon/ceph-foo
-	  ceph-disk chown /dev/sdb1
+	  chown -R ceph:ceph /var/lib/ceph/osd/ceph-123
 
       #. Restart the daemon(s)
 
diff --git a/src/ceph-osd-prestart.sh b/src/ceph-osd-prestart.sh
index 77974e8a5827..cefca854e61f 100644
--- a/src/ceph-osd-prestart.sh
+++ b/src/ceph-osd-prestart.sh
@@ -56,7 +56,7 @@ fi
 owner=`stat -c %U $data/.`
 if [ $owner != 'ceph' -a $owner != 'root' ]; then
     echo "ceph-osd data dir $data is not owned by 'ceph' or 'root'"
-    echo "you must 'ceph-disk chown ...' or similar to fix ownership"
+    echo "you must 'chown -R ceph:ceph ...' or similar to fix ownership"
     exit 1
 fi