grep: updated to 3.1

[crossrootfs.git] / rc / rc

diff --git a/rc/rc b/rc/rc
index 82518f16dea932678b52652e39340f91ceb899bf..a200e6a5b8371736ea619bae8e43e7e6285dd932 100644 (file)
--- a/rc/rc
+++ b/rc/rc
@@ -9,8 +9,8 @@ echo "The system is coming up.  Please wait."
 . /etc/rc.conf
 
 # Start udev
-/bin/mount -n -t proc none /proc
-/bin/mount -n -t sysfs none /sys
+/bin/mount -t proc none /proc
+/bin/mount -t sysfs none /sys
 /sbin/start_udev
 
 # Create device-mapper device nodes and scan for LVM volume groups
@@ -20,10 +20,14 @@ if [ -x /sbin/lvm ]; then
 fi
 
 # Mount root read-only
-/bin/mount -n -o remount,ro /
+/bin/mount -o remount,ro /
+
+if [ -f /forcefsck ]; then
+FORCEFSCK="-f"
+fi
 
 # Check filesystems
-/sbin/fsck -A -T -C -a
+/sbin/fsck $FORCEFSCK -A -T -C -a
 if [ $? -gt 1 ]; then
        echo
        echo "***************  FILESYSTEM CHECK FAILED  ******************"
@@ -39,16 +43,12 @@ if [ $? -gt 1 ]; then
        /sbin/sulogin -p
        echo "Automatic reboot in progress..."
        /bin/umount -a -r
-       /bin/mount -n -o remount,ro /
+       /bin/mount -o remount,ro /
        /sbin/reboot -f
        exit 0
 fi
 
 # Mount local filesystems
-/bin/mount -n -o remount,rw /
-/bin/umount /sys /proc
-/bin/rm -f /etc/mtab*
-/bin/touch /etc/mtab
 /bin/mount -o remount,rw /
 /bin/mount -a -O no_netdev