From: Ben Gras <ben@minix3.org>
Date: Thu, 1 Sep 2005 16:39:03 +0000 (+0000)
Subject: Reinstall fix.
X-Git-Tag: v3.1.0~198
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zpipe.c?a=commitdiff_plain;h=79dd653e1adc880641f255158dc6376257c1938f;p=minix.git

Reinstall fix.
---

diff --git a/commands/scripts/setup.sh b/commands/scripts/setup.sh
index 64622ab38..fe85ae8e2 100755
--- a/commands/scripts/setup.sh
+++ b/commands/scripts/setup.sh
@@ -430,16 +430,12 @@ test -n "$keymap" && cp -p "/usr/lib/keymaps/$keymap.map" /mnt/etc/keymap
 umount /dev/$root >/dev/null || exit	# Unmount the new root.
 mount /dev/$usr /mnt >/dev/null || exit
 
-if [ ! "$auto" = "r" ]
-then
-	# Make bootable.
-	installboot -d /dev/$root /usr/mdec/bootblock /boot/boot >/dev/null || exit
-	edparams /dev/$root "rootdev=$root; ramimagedev=$root; $disable; minix(=,Start MINIX 3) { unset image; boot; }; smallminix(+,Start Small MINIX 3) { image=/boot/image_small; ramsize=0; boot; }; main() { echo By default, MINIX 3 will automatically load in 3 seconds.; echo Press ESC to enter the monitor for special configuration.; trap 3000 boot; menu; }; save" || exit
-	pfile="/mnt/src/tools/fdbootparams"
-	# echo "Remembering boot parameters in ${pfile}."
-	echo "rootdev=$root; ramimagedev=$root; $disable; save" >$pfile || exit
-	umount /dev/$usr
-fi
+# Make bootable.
+installboot -d /dev/$root /usr/mdec/bootblock /boot/boot >/dev/null || exit
+
+edparams /dev/$root "rootdev=$root; ramimagedev=$root; $disable; minix(=,Start MINIX 3) { unset image; boot; }; smallminix(+,Start Small MINIX 3) { image=/boot/image_small; ramsize=0; boot; }; main() { echo By default, MINIX 3 will automatically load in 3 seconds.; echo Press ESC to enter the monitor for special configuration.; trap 3000 boot; menu; }; save" || exit
+pfile="/mnt/src/tools/fdbootparams"
+echo "rootdev=$root; ramimagedev=$root; $disable; save" >$pfile
 
 sync