From: Dan van der Ster <daniel.vanderster@cern.ch>
Date: Mon, 30 Jul 2018 09:12:31 +0000 (+0200)
Subject: rpm: silence osd block chown
X-Git-Tag: v13.2.2~99^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F23324%2Fhead;p=ceph.git

rpm: silence osd block chown

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
Fixes: http://tracker.ceph.com/issues/25152
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 4897a2dfbfc..535163a5ed0 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1538,7 +1538,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 -f -h ceph:ceph /var/lib/ceph/osd/*/block* 2>&1 > /dev/null || :
 
 %preun osd
 %if 0%{?suse_version}