2002-01-08 Yoshinori K. Okuji <okuji@gnu.org>

* grub/main.c (use_preset_menu): New variable.
	(OPT_PRESET_MENU): New macro.
	(longopts): Added an entry for "--preset-menu".
	(usage): Added a description for "--preset-menu". Also, change
	the first character of the description for "--device-map" to
	lower case for consistency.
	(main): Set USE_PRESET_MENU to 1 in the case of OPT_PRESET_MENU.
	* stage2/shared.h (use_preset_menu): Declared.
	* stage2/stage2.c [PRESET_MENU_STRING || SUPPORT_DISKLESS]
	(open_preset_menu) [GRUB_UTIL]: If USE_PRESET_MENU is false,
	return zero immediately.
This commit is contained in:
okuji 2002-01-08 03:19:23 +00:00
parent 843ddd9712
commit 4ea83d7811
6 changed files with 68 additions and 18 deletions

View file

@ -18,7 +18,7 @@ specify stage2 boot_drive [default=0x0]
specify stage2 config_file [default=/boot/grub/menu.lst]
.TP
\fB\-\-device\-map\fR=\fIFILE\fR
Use the device map file FILE
use the device map file FILE
.TP
\fB\-\-help\fR
display this message and exit
@ -38,6 +38,9 @@ do not use curses
\fB\-\-no\-floppy\fR
do not probe any floppy drive
.TP
\fB\-\-preset\-menu\fR
use the preset menu
.TP
\fB\-\-probe\-second\-floppy\fR
probe the second floppy drive
.TP