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 1C8DF138331 for ; Fri, 18 May 2018 16:08:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4CDD2E09DA; Fri, 18 May 2018 16:08:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 1FD4CE09DA for ; Fri, 18 May 2018 16:08:33 +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 D9270335C78 for ; Fri, 18 May 2018 16:08:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 52F3143 for ; Fri, 18 May 2018 16:08:30 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1526659556.7bbbee4c03367c09ec9cb19737066c781f28c06d.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/misc-functions.sh X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 7bbbee4c03367c09ec9cb19737066c781f28c06d X-VCS-Branch: master Date: Fri, 18 May 2018 16:08:30 +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: 86a28073-a67e-4890-b69c-dd74f3c9185e X-Archives-Hash: 7c1590d7f5b20451b596175d49c7bfdd commit: 7bbbee4c03367c09ec9cb19737066c781f28c06d Author: Jason Zaman gentoo org> AuthorDate: Fri May 18 04:05:29 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri May 18 16:05:56 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=7bbbee4c misc-functions: /selinux is gone in favour of /sys/fs/selinux It was moved to /sys/fs/selinux/ long ago and not supported anymore Bug: https://bugs.gentoo.org/655996 Signed-off-by: Jason Zaman gentoo.org> bin/misc-functions.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 0648e6cfd..f3ad52305 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -439,14 +439,12 @@ preinst_selinux_labels() { # SELinux file labeling (needs to execute after preinst) # only attempt to label if setfiles is executable # and 'context' is available on selinuxfs. - if [ -f /selinux/context -o -f /sys/fs/selinux/context ] && \ - [ -x /usr/sbin/setfiles -a -x /usr/sbin/selinuxconfig ]; then + if [ -f /sys/fs/selinux/context -a -x /usr/sbin/setfiles -a -x /usr/sbin/selinuxconfig ]; then __vecho ">>> Setting SELinux security labels" ( eval "$(/usr/sbin/selinuxconfig)" || \ die "Failed to determine SELinux policy paths."; - addwrite /selinux/context addwrite /sys/fs/selinux/context /usr/sbin/setfiles -F "${file_contexts_path}" -r "${D}" "${D}"