From: Sage Weil <sage@redhat.com>
Date: Wed, 25 Jul 2018 21:22:04 +0000 (-0500)
Subject: Revert "rpm,deb: fix chown to use -h"
X-Git-Tag: v14.0.1~772^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e58096526a133826204c4cfa69cc31891c09ed2f;p=ceph.git

Revert "rpm,deb: fix chown to use -h"

This reverts commit 92207c76b91c26c0558688a358ade7c0d94d1b59.

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

diff --git a/ceph.spec.in b/ceph.spec.in
index 2440bc8b135..8415e2e6e9a 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1534,7 +1534,7 @@ fi
     /usr/lib/systemd/systemd-sysctl %{_sysctldir}/90-ceph-osd.conf > /dev/null 2>&1 || :
 %endif
 # work around https://tracker.ceph.com/issues/24903
-chown -h ceph:ceph /var/lib/ceph/osd/*/block* 2>&1 > /dev/null || :
+chown ceph:ceph /var/lib/ceph/osd/*/block* 2>&1 > /dev/null || :
 
 %preun osd
 %if 0%{?suse_version}
diff --git a/debian/ceph-osd.postinst b/debian/ceph-osd.postinst
index 8acfc074311..6ae5349bce0 100644
--- a/debian/ceph-osd.postinst
+++ b/debian/ceph-osd.postinst
@@ -26,7 +26,7 @@ case "$1" in
 	[ -x /etc/init.d/procps ] && invoke-rc.d procps restart || :
 	[ -x /sbin/start ] && start ceph-osd-all || :
 	# work around https://tracker.ceph.com/issues/24903
-	chown -h ceph:ceph /var/lib/ceph/osd/*/block* 2>&1 > /dev/null || :
+	chown ceph:ceph /var/lib/ceph/osd/*/block* 2>&1 > /dev/null || :
     ;;
     abort-upgrade|abort-remove|abort-deconfigure)
 	: