From: Ben Gras <ben@minix3.org>
Date: Fri, 13 May 2005 12:27:42 +0000 (+0000)
Subject: If the file (created by setup) exists, use boot parameters from there
X-Git-Tag: v3.1.0~841
X-Git-Url: http://zhaoyanbai.com/repos/tz-link.htm?a=commitdiff_plain;h=e248f7c1a3e5334cf9986e409f4a3e29fe69882f;p=minix.git

If the file (created by setup) exists, use boot parameters from there
for the boot floppy instead of copying it from the current root partition.
This makes making a boot floppy at installation time before booting from
the new system possible (conveniently).
---

diff --git a/tools/mkboot b/tools/mkboot
index 562739fc8..38e578194 100755
--- a/tools/mkboot
+++ b/tools/mkboot
@@ -138,9 +138,15 @@ fdboot)
 
 	# Make bootable and copy the boot parameters.
 	installboot -d $dev $mdec/bootblock /boot/boot || exit
-	dd if=$root of=$dev skip=1 seek=1 count=1 conv=silent || exit
+	pfile=fdbootparams
+	if [ -f $pfile ]
+	then	echo "Using floppy boot parameters from file $pfile."
+		edparams $dev "`cat $pfile`" || exit
+	else	echo "Copying floppy boot parameters from $root."
+		dd if=$root of=$dev skip=1 seek=1 count=1 conv=silent || exit
+	fi
 	edparams $dev 'main(){delay 2000;boot}; save' || exit
-	echo "Test kernel installed on $dev with boot parameters from $root"
+	echo "Test kernel installed on $dev"
 	;;
 
 cdfdboot)