- disable_selinux(), relabel_selinux(), clean_vserver_mtab() used only in rc.sysinit...

svn-id: @8931

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index ea6c5232af1bcbba84f89a9f0c4d298338a1df88..ce4762ca24d6bf0f18163970a56740b7556fa3c2 100644 (file)
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -887,48 +887,6 @@ log_failed ()
        initlog -n $0 -s "$1 $2" -e 2
 }
 
-disable_selinux() {
-       typeset _d selinuxfs _t _r
-
-       while read _d selinuxfs _t _r; do
-               [ "$_t" = "selinuxfs" ] && break
-       done </proc/mounts
-       echo "*** Warning -- SELinux is active"
-       echo "*** Disabling security enforcement for system recovery."
-       echo "*** Run 'setenforce 1' to reenable."
-       echo "0" > $selinuxfs/enforce
-}
-
-relabel_selinux() {
-       typeset _d selinuxfs _t _r
-
-       while read _d selinuxfs _t _r; do
-               [ "$_t" = "selinuxfs" ] && break
-       done </proc/mounts
-       echo "
-         *** Warning -- SELinux relabel is required. ***
-         *** Disabling security enforcement.         ***
-         *** Relabeling could take a very long time, ***
-         *** depending on file system size.          ***
-         "
-       echo "0" > $selinuxfs/enforce
-       /sbin/fixfiles -F relabel > /dev/null 2>&1
-       rm -f /.autorelabel
-       echo "*** Enabling security enforcement.         ***"
-       echo $SELINUX > $selinuxfs/enforce
-}
-
-# Remove duplicate entries from mtab (for vserver guest use only)
-clean_vserver_mtab() {
-       :>/etc/mtab.clean
-       while read device mountpoint line; do
-               grep -qs "$mountpoint" /etc/mtab.clean || \
-                       echo "$device $mountpoint $line" >> /etc/mtab.clean
-       done < /etc/mtab
-       cat /etc/mtab.clean > /etc/mtab
-       rm -f /etc/mtab.clean
-}
-
 # Check if any flavor of portmapper is running
 check_portmapper() {
        typeset RPCINFO

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 16d18a54cf9aab2808dd4b24e042dc982222804d..4ab5c5e6f8c441047e2bc0e5e57a2dfdf1b6afb6 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -43,6 +43,49 @@ CONSOLE_LOGLEVEL=1
 # Read functions
 . /etc/rc.d/init.d/functions
 
+disable_selinux() {
+       typeset _d selinuxfs _t _r
+
+       while read _d selinuxfs _t _r; do
+               [ "$_t" = "selinuxfs" ] && break
+       done </proc/mounts
+       echo "*** Warning -- SELinux is active"
+       echo "*** Disabling security enforcement for system recovery."
+       echo "*** Run 'setenforce 1' to reenable."
+       echo "0" > $selinuxfs/enforce
+}
+
+relabel_selinux() {
+       typeset _d selinuxfs _t _r
+
+       while read _d selinuxfs _t _r; do
+               [ "$_t" = "selinuxfs" ] && break
+       done </proc/mounts
+       echo "
+         *** Warning -- SELinux relabel is required. ***
+         *** Disabling security enforcement.         ***
+         *** Relabeling could take a very long time, ***
+         *** depending on file system size.          ***
+         "
+       echo "0" > $selinuxfs/enforce
+       /sbin/fixfiles -F relabel > /dev/null 2>&1
+       rm -f /.autorelabel
+       echo "*** Enabling security enforcement.         ***"
+       echo $SELINUX > $selinuxfs/enforce
+}
+
+# Remove duplicate entries from mtab (for vserver guest use only)
+clean_vserver_mtab() {
+       :>/etc/mtab.clean
+       while read device mountpoint line; do
+               grep -qs "$mountpoint" /etc/mtab.clean || \
+                       echo "$device $mountpoint $line" >> /etc/mtab.clean
+       done < /etc/mtab
+       cat /etc/mtab.clean > /etc/mtab
+       rm -f /etc/mtab.clean
+}
+
+
 # boot logging to /var/log/boot.msg. install showconsole package to get it.
 if [ -x /sbin/blogd ] && ! is_no "$RC_BOOTLOG"; then
        RC_BOOTLOG=1