[gentoo-commits] repo/gentoo:master commit in: sys-libs/libsemanage/

[Jason Zaman]

commit:     b0263cde1df273cfa72724a98f7bc3194786ed74
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sun May 27 11:06:48 2018 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun May 27 11:07:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0263cde

sys-libs/libsemanage: fix migration path message check in postinst

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-libs/libsemanage/libsemanage-2.8.ebuild  | 2 +-
 sys-libs/libsemanage/libsemanage-9999.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-libs/libsemanage/libsemanage-2.8.ebuild 
b/sys-libs/libsemanage/libsemanage-2.8.ebuild
index 0cc1dbbf8b4..f527f9bb25f 100644
--- a/sys-libs/libsemanage/libsemanage-2.8.ebuild
+++ b/sys-libs/libsemanage/libsemanage-2.8.ebuild
@@ -116,7 +116,7 @@ multilib_src_install() {
 pkg_postinst() {
        # Migrate the SELinux semanage configuration store if not done already
        local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' 
"${EROOT}"/etc/selinux/config 2>/dev/null)
-       if [ -n "${selinuxtype}" ] && [ ! -d 
"${EROOT}"/var/lib/selinux/${mcs}/active ] ; then
+       if [ -n "${selinuxtype}" ] && [ ! -d 
"${EROOT}"/var/lib/selinux/${selinuxtype}/active ] ; then
                ewarn "Since the 2.4 SELinux userspace, the policy module store 
is moved"
                ewarn "from /etc/selinux to /var/lib/selinux. The migration 
will be run now."
                ewarn "If there are any issues, it can be done manually by 
running:"

diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild 
b/sys-libs/libsemanage/libsemanage-9999.ebuild
index 0cc1dbbf8b4..f527f9bb25f 100644
--- a/sys-libs/libsemanage/libsemanage-9999.ebuild
+++ b/sys-libs/libsemanage/libsemanage-9999.ebuild
@@ -116,7 +116,7 @@ multilib_src_install() {
 pkg_postinst() {
        # Migrate the SELinux semanage configuration store if not done already
        local selinuxtype=$(awk -F'=' '/SELINUXTYPE=/ {print $2}' 
"${EROOT}"/etc/selinux/config 2>/dev/null)
-       if [ -n "${selinuxtype}" ] && [ ! -d 
"${EROOT}"/var/lib/selinux/${mcs}/active ] ; then
+       if [ -n "${selinuxtype}" ] && [ ! -d 
"${EROOT}"/var/lib/selinux/${selinuxtype}/active ] ; then
                ewarn "Since the 2.4 SELinux userspace, the policy module store 
is moved"
                ewarn "from /etc/selinux to /var/lib/selinux. The migration 
will be run now."
                ewarn "If there are any issues, it can be done manually by 
running:"