Author: baggins
Date: Thu Jan 12 17:21:35 2006
New Revision: 6800
Modified:
rc-scripts/trunk/rc.d/rc.sysinit
Log:
- cleanup if vserver logic
Modified: rc-scripts/trunk/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/trunk/rc.d/rc.sysinit (original)
+++ rc-scripts/trunk/rc.d/rc.sysinit Thu Jan 12 17:21:35 2006
@@ -60,19 +60,21 @@
# Read functions
. /etc/rc.d/init.d/functions
-# sysfs is also needed before any other things (under kernel > 2.5)
-if ! is_yes "$VSERVER" && grep -q sysfs /proc/filesystems 2>/dev/null ; then
- mount -n -o gid=17 -t sysfs sysfs /sys
- if [ "$(kernelver)" -ge "002006014" ] && \
- grep -q securityfs /proc/filesystems 2>/dev/null ; then
- mount -n -o gid=17 -t securityfs securityfs
/sys/kernel/security
- fi
-
-fi
+if ! is_yes "$VSERVER" ; then
+ # sysfs is also needed before any other things (under kernel > 2.5)
+ if grep -q sysfs /proc/filesystems 2>/dev/null ; then
+ mount -n -o gid=17 -t sysfs sysfs /sys
+ if [ "$(kernelver)" -ge "002006014" ] && \
+ grep -q securityfs /proc/filesystems 2>/dev/null ; then
+ mount -n -o gid=17 -t securityfs securityfs
/sys/kernel/security
+ fi
+
+ fi
-# selinux
-if ! is_yes "$VSERVER" && grep -q selinuxfs /proc/filesystems 2>/dev/null && !
grep -q selinuxfs /proc/mounts 2>/dev/null; then
- mount -n -o gid=17 -t selinuxfs selinuxfs /selinux
+ # selinux
+ if grep -q selinuxfs /proc/filesystems 2>/dev/null && ! grep -q
selinuxfs /proc/mounts 2>/dev/null; then
+ mount -n -o gid=17 -t selinuxfs selinuxfs /selinux
+ fi
fi
if [ $(kernelverser) = "002006" ]; then
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
