Fix booting into single user mode

Due to a shift, mountfstab was unable to locate the fstab file and
mount other file systems causing a number of errors to be generated.

diff --git a/etc/rc b/etc/rc
index 9254e540cf39d61122815bf34c376580769ad03d..a8c137b9e444433d025db12dea5424f73ee4f0fb 100755 (executable)
--- a/etc/rc
+++ b/etc/rc
@@ -94,7 +94,6 @@ esac
 
 case $action in
 start)
-    echo -n "Multiuser startup in progress ..."
 
     # National keyboard?
     test -f /etc/keymap && loadkeys /etc/keymap
@@ -110,7 +109,6 @@ start)
     then
         up -n is -period 5HZ
     fi
-    echo
 
     # Set timezone.
     export TZ=GMT0
@@ -175,10 +173,13 @@ start)
 
     if [ "$sflag" ]
     then
-       echo "Single user."
+       echo "Single user. Press ^D to resume multiuser startup."
        intr sh
+       echo
     fi
 
+    echo "Multiuser startup in progress ..."
+
     case "`printroot -r`":$bootcd in
     /dev/ram:)
        # Remove boot-only things to make space,

diff --git a/etc/rc.subr.minix b/etc/rc.subr.minix
index 4a46c611d962675a715175fdf56a17d23f4703e3..201cc441aa6510bd0de0dfaa84cf5e15fe1f7c56 100755 (executable)
--- a/etc/rc.subr.minix
+++ b/etc/rc.subr.minix
@@ -1,8 +1,6 @@
 
 mountfstab()
 {
-       shift `expr $OPTIND - 1`
-
        fstabfile="$1"
 
        if [ ! -f $fstabfile ]