Here is a new version of the terminal --silent option. This time it actually
works. ;-)
(The old version had the undesired sideeffect that --timeout did not work.
Not at all what I intended)
Regards
Henrik Nordstr�m
Index: ChangeLog
===================================================================
RCS file: /cvsroot/grub/grub/ChangeLog,v
retrieving revision 1.484
diff -u -w -r1.484 ChangeLog
--- ChangeLog 6 Apr 2002 22:30:18 -0000 1.484
+++ ChangeLog 17 Apr 2002 19:29:00 -0000
@@ -1,3 +1,9 @@
+2002-04-15 Henrik Nordsttrom <[EMAIL PROTECTED]>
+
+ * stage2/builtins.c (terminal_func): New --silent option
+ to supress the "Press any key to continue" message. Useful
+ in combination with --timeout.
+
2002-04-06 Pavel Roskin <[EMAIL PROTECTED]>
* util/grub-install.in: Fix hardcoded /dev/hda1.
Index: stage2/builtins.c
===================================================================
RCS file: /cvsroot/grub/grub/stage2/builtins.c,v
retrieving revision 1.129
diff -u -w -r1.129 builtins.c
--- stage2/builtins.c 6 Apr 2002 12:15:13 -0000 1.129
+++ stage2/builtins.c 17 Apr 2002 19:29:00 -0000
@@ -3976,6 +3976,7 @@
int dumb = 0;
int saved_terminal = terminal;
int lines = 0;
+ int silent = 0;
/* Get GNU-style long options. */
while (1)
@@ -4003,6 +4004,8 @@
return 1;
}
}
+ else if (grub_memcmp (arg, "--silent", sizeof ("--silent") - 1) == 0)
+ silent = 1;
else
break;
@@ -4110,6 +4113,7 @@
/* Prompt the user, once per sec. */
if ((time1 = getrtsecs ()) != time2 && time1 != 0xFF)
{
+ if (!silent)
grub_printf ("Press any key to continue.\n");
time2 = time1;
if (to > 0)
@@ -4136,7 +4140,7 @@
"terminal",
terminal_func,
BUILTIN_MENU | BUILTIN_CMDLINE | BUILTIN_HELP_LIST,
- "terminal [--dumb] [--timeout=SECS] [--lines=LINES] [console] [serial]",
+ "terminal [--dumb] [--timeout=SECS] [--lines=LINES] [--silent] [console] [serial]",
"Select a terminal. When serial is specified, wait until you push any key"
" to continue. If both console and serial are specified, the terminal"
" to which you input a key first will be selected. If no argument is"
