]> 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>
Thu, 20 Jul 2017 13:55:03 +0000 (15:55 +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 kraken.

ceph.spec.in

index fa719e4fba0cdf234d415c9c5f57ab05ecfcca2f..d2dc82634eeef510a267c4ce24818a165869afa7 100644 (file)
@@ -654,6 +654,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