]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blob - src/patches/grub-0.95-hiddenmenu-tweak.patch
Merge branch 'master' into next
[people/pmueller/ipfire-2.x.git] / src / patches / grub-0.95-hiddenmenu-tweak.patch
1 --- grub-0.95/stage2/stage2.c.hidden 2004-09-30 16:39:38.028893664 -0400
2 +++ grub-0.95/stage2/stage2.c 2004-09-30 16:42:07.981097464 -0400
3 @@ -235,6 +235,8 @@
4 char *cur_entry = 0;
5 struct term_entry *prev_term = NULL;
6
7 + cls();
8 +
9 /*
10 * Main loop for menu UI.
11 */
12 @@ -262,14 +264,16 @@
13 /* Get current time. */
14 while ((time1 = getrtsecs ()) == 0xFF)
15 ;
16 + grub_printf("\rPress any key to enter the menu\n\n\n");
17
18 while (1)
19 {
20 /* Check if ESC is pressed. */
21 - if (checkkey () != -1 && ASCII_CHAR (getkey ()) == '\e')
22 + if (checkkey () != -1)
23 {
24 grub_timeout = -1;
25 show_menu = 1;
26 + getkey ();
27 break;
28 }
29
30 @@ -288,7 +292,8 @@
31 grub_timeout--;
32
33 /* Print a message. */
34 - grub_printf ("\rPress `ESC' to enter the menu... %d ",
35 + grub_printf ("\rBooting %s in %d seconds...",
36 + get_entry(menu_entries, first_entry + entryno, 0),
37 grub_timeout);
38 }
39 }