From: Boris Ranto <branto@redhat.com>
Date: Mon, 5 Jun 2017 16:44:18 +0000 (+0200)
Subject: selinux: Install ceph-base before ceph-selinux
X-Git-Tag: v10.2.10~111^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e9608e0c4097caa3c2e344fc3456ac3d6c816d5e;p=ceph.git

selinux: Install ceph-base before ceph-selinux

We need to have ceph-base installed before ceph-selinux to use ceph-disk
in %post script. The default ordering is random and so the installation
randomly failed to relabel the files.

Fixes: http://tracker.ceph.com/issues/20184
Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit e69086645d3411a2ed781609b670eb5f16ac4810)
Conflicts:
	ceph.spec.in: No _epoch_prefix in jewel
---

diff --git a/ceph.spec.in b/ceph.spec.in
index db989907290f..2a16e9883536 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -552,6 +552,7 @@ Summary:	SELinux support for Ceph MON, OSD and MDS
 Group:		System Environment/Base
 Requires:	ceph-base = %{epoch}:%{version}-%{release}
 Requires:	policycoreutils, libselinux-utils
+Requires(post):	ceph-base = %{epoch}:%{version}-%{release}
 Requires(post): selinux-policy-base >= %{_selinux_policy_version}, policycoreutils, gawk
 Requires(postun): policycoreutils
 %description selinux