From: David van Moolenbroek <david@minix3.org>
Date: Tue, 10 Jan 2012 14:05:28 +0000 (+0100)
Subject: rc: transitional fix for old fstab
X-Git-Tag: v3.2.0~145
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zpipe.c?a=commitdiff_plain;h=11c15db517a377277705742ef1c044098ec7f7ee;p=minix.git

rc: transitional fix for old fstab
---

diff --git a/etc/rc b/etc/rc
index 804320c54..9254e540c 100755
--- a/etc/rc
+++ b/etc/rc
@@ -56,27 +56,14 @@ edit()
 # /etc/fstab, and fscks and mounts its filesystems.
 mountfstab_poorman()
 {
-    # /etc/fstab lists the root, tmp and usr devices.
-    . $FSTAB
+    echo "WARNING: old fstab format, please upgrade!"
 
-    # Check if the system crashed.
-    if shutdown -C
-    then
-	echo
-	echo "The system was not properly shut down.  Checking file systems."
-	fflag=-f
-    fi
+    # /etc/fstab lists the root, home, and usr devices.
+    . $FSTAB
 
-    if [ -n "$fflag" ]
-    then
-	echo "fsck.mfs / - $root"
-	intr fsck.mfs $fsckopts $root
-	echo "fsck.mfs /usr - $usr"
-	intr fsck.mfs $fsckopts $usr
-	if [ ! -z "$home" ]
-	then	echo "fsck.mfs /home - $home"
-		intr fsck.mfs $fsckopts $home
-	fi
+    intr fsck.mfs $fsckopts $usr
+    if [ ! -z "$home" ]
+    then intr fsck.mfs $fsckopts $home
     fi
 
     # mount /usr
@@ -113,7 +100,6 @@ start)
     test -f /etc/keymap && loadkeys /etc/keymap
 
     # options for fsck. default is -r, which prompts the user for repairs.
-    fsckopts="`sysenv fsckopts`"
     optname=fsckopts
     fsckopts=-p
     if sysenv $optname >/dev/null