]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
selinux: Install ceph-base before ceph-selinux
authorBoris Ranto <branto@redhat.com>
Mon, 5 Jun 2017 16:44:18 +0000 (18:44 +0200)
committerBoris Ranto <branto@redhat.com>
Fri, 7 Jul 2017 14:26:38 +0000 (16:26 +0200)
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

ceph.spec.in

index db989907290f2f1b54807aabc73126bb3cd6fce6..2a16e98835365d7c647802480040ece8e4516f47 100644 (file)
@@ -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