commit:     62addf118067dd2cd57c3f5fee35c9e80f9fec42
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Apr 11 21:29:58 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 16:41:17 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=62addf11

Move SELinux mount to sysfs service

The selinux file system is mounted under /sys, so move the code for it
to the appropriate service.

X-Gentoo-Bug: 546290
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=546290

 init.d/procfs.in | 9 ---------
 init.d/sysfs.in  | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/init.d/procfs.in b/init.d/procfs.in
index 636cd20..e7d4fce 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -60,14 +60,5 @@ start()
                fi
        fi
 
-       # Setup Kernel Support for SELinux
-       if [ -d /sys/fs/selinux ] && ! mountinfo -q /sys/fs/selinux; then
-               if grep -qs selinuxfs /proc/filesystems; then
-                       ebegin "Mounting SELinux filesystem"
-                       mount -t selinuxfs selinuxfs /sys/fs/selinux
-                       eend $?
-               fi
-       fi
-
        return 0
 }

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index bc0d9d3..6e52a9d 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -82,6 +82,15 @@ mount_misc()
                fi
        fi
 
+       # Setup Kernel Support for SELinux
+       if [ -d /sys/fs/selinux ] && ! mountinfo -q /sys/fs/selinux; then
+               if grep -qs selinuxfs /proc/filesystems; then
+                       ebegin "Mounting SELinux filesystem"
+                       mount -t selinuxfs selinuxfs /sys/fs/selinux
+                       eend $?
+               fi
+       fi
+
        # setup up kernel support for efivarfs
        # slightly complicated, as if it's build as a module but NOT yet loaded,
        # it will NOT appear in /proc/filesystems yet

Reply via email to