From: Ben Gras <ben@minix3.org>
Date: Wed, 7 Nov 2007 09:28:44 +0000 (+0000)
Subject: Minor tweaks to menu naming.
X-Git-Url: http://zhaoyanbai.com/repos/doxygen-warnings.log?a=commitdiff_plain;h=cbe9454704ff5972aa696a13715a2d921cac855a;p=minix.git

Minor tweaks to menu naming.
---

diff --git a/commands/scripts/setup.sh b/commands/scripts/setup.sh
index 460a25291..49aac929d 100755
--- a/commands/scripts/setup.sh
+++ b/commands/scripts/setup.sh
@@ -584,7 +584,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) { image=/boot/image_big; 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
+edparams /dev/$root "rootdev=$root; ramimagedev=$root; minix(1,Start MINIX 3) { image=/boot/image_big; boot; }; newminix(2,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/mkboot b/tools/mkboot
index 7c6344ea4..38ce132de 100755
--- a/tools/mkboot
+++ b/tools/mkboot
@@ -197,7 +197,7 @@ disable=inet;
 bootcd=1;
 cdproberoot=1;
 ata_id_timeout=2;
-bootbig(1, Regular MINIX 3) { unset image; boot }
+bootbig(1, MINIX 3) { unset image; boot }
 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 };
 main(){trap 10000 boot; menu; };
 save' || exit