From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A183B138330 for ; Sun, 27 May 2018 11:08:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80FB0E0872; Sun, 27 May 2018 11:08:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 58727E0872 for ; Sun, 27 May 2018 11:08:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC969335CA1 for ; Sun, 27 May 2018 11:08:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 248ED40 for ; Sun, 27 May 2018 11:08:10 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1527419275.b0263cde1df273cfa72724a98f7bc3194786ed74.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libsemanage/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libsemanage/libsemanage-2.8.ebuild sys-libs/libsemanage/libsemanage-9999.ebuild X-VCS-Directories: sys-libs/libsemanage/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: b0263cde1df273cfa72724a98f7bc3194786ed74 X-VCS-Branch: master Date: Sun, 27 May 2018 11:08:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9ee8b531-62b5-4b00-8fba-0a046d801efe X-Archives-Hash: 758b4b8346ba4d536ad9f70a69038383 commit: b0263cde1df273cfa72724a98f7bc3194786ed74 Author: Jason Zaman gentoo org> AuthorDate: Sun May 27 11:06:48 2018 +0000 Commit: Jason Zaman gentoo 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:"