From: Ben Gras <ben@minix3.org>
Date: Mon, 22 Aug 2005 10:01:52 +0000 (+0000)
Subject: Extra setup umounts in case of aborted previous installs.
X-Git-Tag: v3.1.0~321
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/invmod.png?a=commitdiff_plain;h=10ba94be2bcf073412dfd36c7ebd314df2d07b39;p=minix.git

Extra setup umounts in case of aborted previous installs.
Forget about the /usr re-mounting, it's not necessary and (potentially)
causes problems during setup.
---

diff --git a/commands/scripts/setup.sh b/commands/scripts/setup.sh
index 24bdf1676..5d76e6bb2 100755
--- a/commands/scripts/setup.sh
+++ b/commands/scripts/setup.sh
@@ -206,6 +206,8 @@ done
 root=${primary}s0
 swap=${primary}s1
 usr=${primary}s2
+umount /dev/$usr 2>/dev/null && echo "Unmounted $usr for you."
+umount /dev/$root 2>/dev/null && echo "Unmounted $root for you."
 
 hex2int()
 {
@@ -388,32 +390,6 @@ files="`find /usr | wc -l`"
 cpdir -v /usr /mnt | progressbar "$files" || exit	# Copy the usr floppy.
 
 umount /dev/$usr >/dev/null || exit		# Unmount the intended /usr.
-umount $fdusr	>/dev/null 			# Unmount the /usr floppy.
-mount /dev/$usr /usr >/dev/null || exit		# A new /usr
-
-if [ $fdroot = unknown ]
-then
-    echo "
-By now the floppy USR has been copied to /dev/$usr, and it is now in use as
-/usr.  Please insert the installation ROOT floppy in a floppy drive."
-
-    drive=
-    while [ -z "$drive" ]
-    do
-	echo -n "What floppy drive is it in? [0] "; read drive
-
-	case $drive in
-	'')	drive=0
-	    ;;
-	[01])
-	    ;;
-	*)	echo "It must be 0 or 1, not \"$drive\"."
-	    drive=
-	esac
-    done
-    fdroot=/dev/fd$drive
-fi
-
 mount /dev/$root /mnt >/dev/null || exit
 # Running from the installation CD.
 files="`find / -xdev | wc -l`"