- drop unused vserver stuff

[rc-scripts.git] / rc.d / rc.sysinit

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index b01b9d38f863d7cfaecda6ca73faad4a79430f1a..b6bfb29827db80c7d8a9951c8de9964161673f3f 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -197,17 +197,6 @@ enable_swap() {
        is_yes "$AUTOSWAP" && enable_autoswap
 }
 
-# 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
-}
-
 # Loads modules from /etc/modules, /etc/modules.X.Y and /etc/modules.X.Y.Z
 load_kernel_modules() {
        local modules_file=$1
@@ -365,7 +354,7 @@ else
        RC_BOOTLOG=
 fi
 
-if ! is_yes "$VSERVER" && [[ "$container" != lxc* ]]; then
+if [[ "$container" != lxc* ]]; then
        # we need /proc mounted before everything
        is_fsmounted proc /proc || mount -n /proc || mount -n -o gid=17,hidepid=2 -t proc /proc /proc
 
@@ -437,7 +426,7 @@ else
        domainname ""
 fi
 
-if ! is_yes "$VSERVER" && [[ "$container" != lxc* ]]; then
+if [[ "$container" != lxc* ]]; then
        # Set console loglevel
        if [ -n "$CONSOLE_LOGLEVEL" ]; then
                dmesg -n $CONSOLE_LOGLEVEL
@@ -629,7 +618,7 @@ if [ -n "$IN_INITLOG" ]; then
        IN_INITLOG=""
 fi
 
-if ! is_yes "$VSERVER" && [[ "$container" != lxc* ]]; then
+if [[ "$container" != lxc* ]]; then
        # Clear mtab
        > /etc/mtab
        [ -f /etc/cryptomtab ] && > /etc/cryptomtab
@@ -930,7 +919,6 @@ else
                killall -IO blogd
        fi
 
-       clean_vserver_mtab
 fi
 
 is_yes "$SELINUX" && [ -f /.autorelabel ] && relabel_selinux
@@ -989,37 +977,35 @@ is_yes "$SELINUX" && restorecon /tmp/.ICE-unix >/dev/null 2>&1
 
 test -d /var/run/netreport || mkdir -m 770 /var/run/netreport
 
-if ! is_yes "$VSERVER"; then
-       enable_swap
+enable_swap
 
-       # If a SCSI tape has been detected, load the st module unconditionally
-       # since many SCSI tapes don't deal well with st being loaded and unloaded
-       if [ -f /proc/scsi/scsi ] && grep -q 'Type:   Sequential-Access' /proc/scsi/scsi 2>/dev/null ; then
-               if grep -qv ' 9 st' /proc/devices 2>/dev/null; then
-                       if [ -n "$USEMODULES" ] ; then
-                               # Try to load the module. If it fails, ignore it...
-                               insmod -p st >/dev/null 2>&1 && modprobe -s st
-                       fi
+# If a SCSI tape has been detected, load the st module unconditionally
+# since many SCSI tapes don't deal well with st being loaded and unloaded
+if [ -f /proc/scsi/scsi ] && grep -q 'Type:   Sequential-Access' /proc/scsi/scsi 2>/dev/null ; then
+       if grep -qv ' 9 st' /proc/devices 2>/dev/null; then
+               if [ -n "$USEMODULES" ] ; then
+                       # Try to load the module. If it fails, ignore it...
+                       insmod -p st >/dev/null 2>&1 && modprobe -s st
                fi
        fi
+fi
 
-       # Now that we have all of our basic modules loaded and the kernel going,
-       # let's dump the syslog ring somewhere so we can find it later
-       mode=0600
-       if [ "$(cat /proc/sys/kernel/dmesg_restrict)" = 0 ]; then
-               mode=0644
-       fi
-       dmesg --raw > /var/log/dmesg
-       chmod $mode /var/log/dmesg
-       i=5
-       while [ $i -ge 0 ]; do
-               if [ -f /var/log/dmesg.$i ]; then
-                       mv -f /var/log/dmesg.$i /var/log/dmesg.$(($i+1))
-               fi
-               i=$(($i-1))
-       done
-       cp -pf /var/log/dmesg /var/log/dmesg.0
+# Now that we have all of our basic modules loaded and the kernel going,
+# let's dump the syslog ring somewhere so we can find it later
+mode=0600
+if [ "$(cat /proc/sys/kernel/dmesg_restrict)" = 0 ]; then
+       mode=0644
 fi
+dmesg --raw > /var/log/dmesg
+chmod $mode /var/log/dmesg
+i=5
+while [ $i -ge 0 ]; do
+       if [ -f /var/log/dmesg.$i ]; then
+               mv -f /var/log/dmesg.$i /var/log/dmesg.$(($i+1))
+       fi
+       i=$(($i-1))
+done
+cp -pf /var/log/dmesg /var/log/dmesg.0
 
 if ! is_no "$RC_PROMPT"; then
        while :; do
@@ -1031,8 +1017,8 @@ if ! is_no "$RC_PROMPT"; then
 fi
 } &
 
-# /proc extra check if the background process we just spawned is still running,
-# as in case of vserver bootup it finishes quite instantly.
+# /proc extra check if the background process we just spawned is still running
+# as it may finish quite instantly.
 if ! is_no "$RC_PROMPT" && [ -d /proc/$! ]; then
        /sbin/getkey i && touch /var/run/confirm
        touch /var/run/getkey_done