| 1 |
commit: f03eee7017c288deabdfc593079397d480ea473a |
| 2 |
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 9 17:47:21 2018 +0000 |
| 4 |
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 9 17:58:13 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f03eee70 |
| 7 |
|
| 8 |
sec-policy/selinux-base-policy: postinst should not die |
| 9 |
|
| 10 |
It breaks catalyst stage building. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
| 13 |
|
| 14 |
.../selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild | 4 ++-- |
| 15 |
.../selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild | 4 ++-- |
| 16 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild |
| 19 |
index c3e96688105..8ef5919d347 100644 |
| 20 |
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild |
| 21 |
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r3.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2017 Gentoo Foundation |
| 24 |
+# Copyright 1999-2018 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI="6" |
| 28 |
@@ -106,7 +106,7 @@ pkg_postinst() { |
| 29 |
|
| 30 |
cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}" |
| 31 |
|
| 32 |
- semodule -s ${i} ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store" |
| 33 |
+ semodule -s ${i} ${COMMAND} |
| 34 |
done |
| 35 |
|
| 36 |
# Relabel depending packages |
| 37 |
|
| 38 |
diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild |
| 39 |
index 111bd573773..33d98c80502 100644 |
| 40 |
--- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild |
| 41 |
+++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20170805-r4.ebuild |
| 42 |
@@ -1,4 +1,4 @@ |
| 43 |
-# Copyright 1999-2017 Gentoo Foundation |
| 44 |
+# Copyright 1999-2018 Gentoo Foundation |
| 45 |
# Distributed under the terms of the GNU General Public License v2 |
| 46 |
|
| 47 |
EAPI="6" |
| 48 |
@@ -106,7 +106,7 @@ pkg_postinst() { |
| 49 |
|
| 50 |
cd /usr/share/selinux/${i} || die "Could not enter /usr/share/selinux/${i}" |
| 51 |
|
| 52 |
- semodule -s ${i} ${COMMAND} || die "Failed to load in base and modules ${MODS} in the $i policy store" |
| 53 |
+ semodule -s ${i} ${COMMAND} |
| 54 |
done |
| 55 |
|
| 56 |
# Relabel depending packages |
Archives