From: Thomas Veerman <thomas@minix3.org>
Date: Fri, 13 Apr 2012 13:52:48 +0000 (+0000)
Subject: Fix booting into single user mode
X-Git-Tag: v3.2.1~589
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/style.css?a=commitdiff_plain;h=6659ae1fc374f9d975fe3c4569967936e8d5ea49;p=minix.git

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 9254e540c..a8c137b9e 100755
--- 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 4a46c611d..201cc441a 100755
--- a/etc/rc.subr.minix
+++ b/etc/rc.subr.minix
@@ -1,8 +1,6 @@
 
 mountfstab()
 {
-	shift `expr $OPTIND - 1`
-
 	fstabfile="$1"
 
 	if [ ! -f $fstabfile ]