Fixes for bios emulation (image names)

diff --git a/tools/chrootmake.sh b/tools/chrootmake.sh
index 889666e551df2bdf3543a85f51e6030e94da94fa..31ad810dd898723945ae944b2420a73348921edc 100755 (executable)
--- 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 172e4d213768d79ac25f97e4b8d8264cf775acf8..2b89ab2d803b62e5ee1e45947aaa9c0b1ed91cdd 100755 (executable)
--- 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