rc-scripts/trunk/rc.d/rc.sysinit

[baggins]

Author: baggins
Date: Thu Jan 12 17:10:56 2006
New Revision: 6797

Modified:
   rc-scripts/trunk/rc.d/rc.sysinit
Log:
- more non-vserver things if'ed
- kill psdevtab removal (file is obsolete since 1998)


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:10:56 2006
@@ -833,23 +833,18 @@
 	# Right, now turn on swap in case we swap to files
 	swapon -a >/dev/null 2>&1
 	run_cmd "Enabling swap space" /bin/true
-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 >/dev/null 2>&1
+	# 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 >/dev/null 2>&1
+			fi
 		fi
 	fi
-fi
-
-# There could be a new kernel version. Remove old psdevtab database
-rm -f /etc/psdevtab
 
-if ! is_yes "$VSERVER"; then
 	# 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
 	dmesg -s 131072 > /var/log/dmesg