From: Ben Gras <ben@minix3.org>
Date: Tue, 4 Apr 2006 11:46:50 +0000 (+0000)
Subject: Tralala
X-Git-Tag: v3.1.2a~70
X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=d93b0e8f1828ffbe0dadb7a36e5eb41e674ff7eb;p=minix.git

Tralala
---

diff --git a/tools/mkboot b/tools/mkboot
index 099397011..55c899742 100755
--- a/tools/mkboot
+++ b/tools/mkboot
@@ -187,7 +187,7 @@ cdfdboot)
 	cp -p ../boot/boot /mnt/boot/boot || exit 1
 	umount $dev || exit 1
 	installboot -d $dev ../boot/bootblock boot/boot || exit 1
-	edparams $dev 'unset bootopts; unset servers; disable=inet; image=/boot/image/image_big; bootbig(1, Regular MINIX 3 (requires at least 16 MB RAM)) { image=/boot/image/image ; boot } bootsmall(2, Small MINIX 3 (intended for 8 MB systems)) { image=/boot/image/image_small ; boot } cdproberoot=1; unset rootdev; unset leader; leader() { echo \n--- Welcome to MINIX 3. This is the boot monitor. ---\n\nChoose an option from the menu or press ESC if you need to do anything special.\nOtherwise I will boot with my defaults in 10 seconds.\n\n }; bootcd=1; main(){trap 10000 boot; menu; }; save' || exit
+	edparams $dev 'unset bootopts; unset servers; disable=inet; image=/boot/image/image; bootbig(1, Regular MINIX 3 (requires at least 16 MB RAM)) { image=/boot/image/image ; boot } bootsmall(2, Small MINIX 3 (intended for 8 MB systems)) { image=/boot/image/image_small ; boot } cdproberoot=1; unset rootdev; unset leader; leader() { echo \n--- Welcome to MINIX 3. This is the boot monitor. ---\n\nChoose an option from the menu or press ESC if you need to do anything special.\nOtherwise I will boot with my defaults in 10 seconds.\n\n }; bootcd=1; main(){trap 10000 boot; menu; }; save' || exit
 
 	# copy image
 	dd if=$dev of=cdfdimage bs=8192 count=180
diff --git a/tools/release.sh b/tools/release.sh
index 18692308e..e141fe602 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -47,7 +47,7 @@ disable=inet
 bios_wini=yes
 bios_remap_first=1
 ramimagedev=c0d7p0s0
-bootbig(1, Regular MINIX 3) { unset image; boot }
+bootbig(1, Regular MINIX 3) { image=/boot/image/image_big; boot }
 bootsmall(2, Small MINIX 3 (<16MB)) {image=/boot/image/image_small; boot }
 main() { trap 10000 boot ; menu; }
 save'	| $RELEASEDIR/usr/bin/edparams $TMPDISK3