commit:     7bbbee4c03367c09ec9cb19737066c781f28c06d
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Fri May 18 04:05:29 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> 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 <perfinion <AT> 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}"

Reply via email to