From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B139D138C48 for ; Tue, 14 Apr 2015 16:45:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7952DE0875; Tue, 14 Apr 2015 16:45:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2A6BEE0875 for ; Tue, 14 Apr 2015 16:45:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EF59234098D for ; Tue, 14 Apr 2015 16:45:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5181815EA1 for ; Tue, 14 Apr 2015 16:45:46 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1429029677.62addf118067dd2cd57c3f5fee35c9e80f9fec42.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/procfs.in init.d/sysfs.in X-VCS-Directories: init.d/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 62addf118067dd2cd57c3f5fee35c9e80f9fec42 X-VCS-Branch: master Date: Tue, 14 Apr 2015 16:45:46 +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: a714c3a5-8149-4114-a767-3eec7f994790 X-Archives-Hash: 722d15055b07bfaa4d10b9dfc6d1977b commit: 62addf118067dd2cd57c3f5fee35c9e80f9fec42 Author: William Hubbs gmail com> AuthorDate: Sat Apr 11 21:29:58 2015 +0000 Commit: William Hubbs gentoo 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