Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/openrc:master commit in: init.d/
Date: Fri, 20 Jun 2014 23:42:53
Message-Id: 1403307453.6126700a0723efa4ef1e299da0f58498f742c3a1.williamh@OpenRC
1 commit: 6126700a0723efa4ef1e299da0f58498f742c3a1
2 Author: Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
3 AuthorDate: Sat Apr 19 19:18:18 2014 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 20 23:37:33 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=6126700a
7
8 SELinux filesystem is at /sys/fs/selinux
9
10 The SELinux filesystem has been moved to /sys/fs/selinux for quite some
11 time. We kept supporting /selinux for backwards compatibility, but it's
12 time to move forward on this.
13
14 X-Gentoo-Bug: 511718
15 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=511718
16 Signed-off-by: Sven Vermeulen <sven.vermeulen <AT> siphos.be>
17
18 ---
19 init.d/procfs.in | 4 ++--
20 1 file changed, 2 insertions(+), 2 deletions(-)
21
22 diff --git a/init.d/procfs.in b/init.d/procfs.in
23 index 0db5305..636cd20 100644
24 --- a/init.d/procfs.in
25 +++ b/init.d/procfs.in
26 @@ -61,10 +61,10 @@ start()
27 fi
28
29 # Setup Kernel Support for SELinux
30 - if [ -d /selinux ] && ! mountinfo -q /selinux; then
31 + if [ -d /sys/fs/selinux ] && ! mountinfo -q /sys/fs/selinux; then
32 if grep -qs selinuxfs /proc/filesystems; then
33 ebegin "Mounting SELinux filesystem"
34 - mount -t selinuxfs selinuxfs /selinux
35 + mount -t selinuxfs selinuxfs /sys/fs/selinux
36 eend $?
37 fi
38 fi