From: Ben Gras <ben@minix3.org>
Date: Thu, 13 Apr 2006 17:15:40 +0000 (+0000)
Subject: Fixes for image.
X-Git-Tag: v3.1.2a~6
X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=613e25760d679d524f6cc475b34c0fa642c06c17;p=minix.git

Fixes for image.
---

diff --git a/commands/scripts/setup.sh b/commands/scripts/setup.sh
index 1e80734bc..6757d999a 100755
--- a/commands/scripts/setup.sh
+++ b/commands/scripts/setup.sh
@@ -610,7 +610,7 @@ mount /dev/$usr /mnt >/dev/null || exit
 # Make bootable.
 installboot -d /dev/$root /usr/mdec/bootblock /boot/boot >/dev/null || exit
 
-edparams /dev/$root "rootdev=$root; ramimagedev=$root; minix(1,Start MINIX 3 (requires at least 16 MB RAM)) { label=BIG; boot; }; smallminix(2,Start Small MINIX 3 (intended for 8 MB RAM systems)) { label=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
+edparams /dev/$root "rootdev=$root; ramimagedev=$root; minix(1,Start MINIX 3 (requires at least 16 MB RAM)) { image=/boot/image_big; boot; }; smallminix(2,Start Small MINIX 3 (intended for 8 MB RAM systems)) { image=/boot/image_small; boot; }; newminix(3,Start custom MINIX 3) { unset image; 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; save" >$pfile
 # Save name of CD drive
diff --git a/tools/chrootmake.sh b/tools/chrootmake.sh
index 31ad810dd..d777b4ddd 100755
--- a/tools/chrootmake.sh
+++ b/tools/chrootmake.sh
@@ -9,11 +9,11 @@ cd tools
 rm revision
 rm /boot/image/*
 make install 
-cp /boot/image/* /boot/image/image  # Make big image accessible by this name
+cp /boot/image/* /boot/image_big  # Make big image accessible by this name
 cp ../boot/boot /boot/boot 
 make clean
 make image_small 
-cp image_small /boot/image 
+cp image_small /boot 
 cd /usr/src 
 make clean
 # Let man find the manpages