From: Ken Dreyer <kdreyer@redhat.com>
Date: Fri, 23 Sep 2016 20:49:56 +0000 (-0600)
Subject: rpm: fix permissions for /etc/ceph/rbdmap
X-Git-Tag: v10.2.6~30^2~15^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F11855%2Fhead;p=ceph.git

rpm: fix permissions for /etc/ceph/rbdmap

Prior to this change, the RPM packaging would install /etc/ceph/rbdmap
with exectuable permissions. The execute bit is not necessary and does
not match what the Debian packaging does. Remove the execute bit in this
case.

Fixes: http://tracker.ceph.com/issues/17395

Reported-by: Martin Bukatovic <mbukatov@redhat.com>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit d4b84a13960f9f46593bf89dc92bfc3e54b4851e)

Conflicts:
	ceph.spec.in : trivial context resolution
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 9ddd75fb6664..9f4c21a574d8 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -700,7 +700,7 @@ make %{?_smp_mflags} check
 make DESTDIR=%{buildroot} install
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 find %{buildroot} -type f -name "*.a" -exec rm -f {} ';'
-install -D src/etc-rbdmap %{buildroot}%{_sysconfdir}/ceph/rbdmap
+install -m 0644 -D src/etc-rbdmap %{buildroot}%{_sysconfdir}/ceph/rbdmap
 %if 0%{?fedora} || 0%{?rhel}
 install -m 0644 -D etc/sysconfig/ceph %{buildroot}%{_sysconfdir}/sysconfig/ceph
 %endif