From: Ben Gras <ben@minix3.org>
Date: Wed, 12 Apr 2006 11:32:49 +0000 (+0000)
Subject: Fixes for bios emulation (image names)
X-Git-Tag: v3.1.2a~24
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/named.html?a=commitdiff_plain;h=683efbe4c1e2bf46135419a65a9c0a1ae462e6af;p=minix.git

Fixes for bios emulation (image names)
---

diff --git a/tools/chrootmake.sh b/tools/chrootmake.sh
index 889666e55..31ad810dd 100755
--- a/tools/chrootmake.sh
+++ b/tools/chrootmake.sh
@@ -2,18 +2,19 @@
 set -e
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
 export SHELL=/bin/sh
-cd /usr/src || exit 1
+cd /usr/src 
 make etcfiles
-su bin -c 'make world install' || exit 1
-cd tools || exit 1
+su bin -c 'make world install' 
+cd tools 
 rm revision
 rm /boot/image/*
-make install || exit 1
-cp ../boot/boot /boot/boot || exit 1
+make install 
+cp /boot/image/* /boot/image/image  # Make big image accessible by this name
+cp ../boot/boot /boot/boot 
 make clean
-make image_small || exit 1
-#cp image_small /boot || exit 1
-cd /usr/src || exit 1
+make image_small 
+cp image_small /boot/image 
+cd /usr/src 
 make clean
 # Let man find the manpages
 su bin -c 'makewhatis /usr/man'
diff --git a/tools/release.sh b/tools/release.sh
index 172e4d213..2b89ab2d8 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) { image=/boot/image/image_big; boot }
+bootbig(1, Regular MINIX 3) { image=/boot/image/image; boot }
 bootsmall(2, Small MINIX 3 (<16MB)) {image=/boot/image/image_small; boot }
 main() { trap 10000 boot ; menu; }
 save'	| $RELEASEDIR/usr/bin/edparams $TMPDISK3