merge mainline into intwrap
This commit is contained in:
commit
23e2a517ad
6 changed files with 48 additions and 10 deletions
25
ChangeLog
25
ChangeLog
|
@ -1,3 +1,28 @@
|
|||
2010-08-30 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
* docs/grub.texi (Network): Fix reference to pxe_blksize.
|
||||
Reported by: Ian Turner
|
||||
|
||||
2010-08-30 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
* grub-core/normal/menu.c (grub_wait_after_message): Add a 10 second
|
||||
timeout to avoid indefinite boot stalling.
|
||||
|
||||
2010-08-30 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
* grub-core/normal/color.c (grub_env_write_color_normal): Fix a warning.
|
||||
(grub_env_write_color_highlight): Likewise.
|
||||
|
||||
2010-08-30 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
* grub-core/normal/term.c (print_more): Return to normal and not
|
||||
to standard state after printing "---MORE---".
|
||||
|
||||
2010-08-30 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
* grub-core/term/i386/vga_common.c (grub_console_setcolorstate):
|
||||
Mask out the bit 0x80 since it has other meaning that specifiing color.
|
||||
|
||||
2010-08-29 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
New relocator. Allows for more kernel support and more straightforward
|
||||
|
|
|
@ -1436,7 +1436,7 @@ The boot file name provided by DHCP. Read-only.
|
|||
The name of the DHCP server responsible for these boot parameters.
|
||||
Read-only.
|
||||
|
||||
@item net_pxe_blksize
|
||||
@item pxe_blksize
|
||||
The PXE transfer block size. Read-write, defaults to 512.
|
||||
|
||||
@item pxe_default_server
|
||||
|
|
|
@ -125,10 +125,11 @@ set_colors (void)
|
|||
|
||||
/* Replace default `normal' colors with the ones specified by user (if any). */
|
||||
char *
|
||||
grub_env_write_color_normal (struct grub_env_var *var, const char *val)
|
||||
grub_env_write_color_normal (struct grub_env_var *var __attribute__ ((unused)),
|
||||
const char *val)
|
||||
{
|
||||
if (grub_parse_color_name_pair (&color_normal, val))
|
||||
return 0;
|
||||
return NULL;
|
||||
|
||||
set_colors ();
|
||||
|
||||
|
@ -137,10 +138,11 @@ grub_env_write_color_normal (struct grub_env_var *var, const char *val)
|
|||
|
||||
/* Replace default `highlight' colors with the ones specified by user (if any). */
|
||||
char *
|
||||
grub_env_write_color_highlight (struct grub_env_var *var, const char *val)
|
||||
grub_env_write_color_highlight (struct grub_env_var *var __attribute__ ((unused)),
|
||||
const char *val)
|
||||
{
|
||||
if (grub_parse_color_name_pair (&color_highlight, val))
|
||||
return 0;
|
||||
return NULL;
|
||||
|
||||
set_colors ();
|
||||
|
||||
|
|
|
@ -43,9 +43,20 @@ grub_err_t (*grub_gfxmenu_try_hook) (int entry, grub_menu_t menu,
|
|||
void
|
||||
grub_wait_after_message (void)
|
||||
{
|
||||
grub_uint64_t endtime;
|
||||
grub_xputs ("\n");
|
||||
grub_printf_ (N_("Press any key to continue..."));
|
||||
(void) grub_getkey ();
|
||||
grub_refresh ();
|
||||
|
||||
endtime = grub_get_time_ms () + 10000;
|
||||
|
||||
while (grub_get_time_ms () < endtime)
|
||||
if (grub_checkkey () >= 0)
|
||||
{
|
||||
grub_getkey ();
|
||||
break;
|
||||
}
|
||||
|
||||
grub_xputs ("\n");
|
||||
}
|
||||
|
||||
|
|
|
@ -86,7 +86,7 @@ print_more (void)
|
|||
{
|
||||
grub_print_ucs4 (unicode_str, unicode_last_position, 0, 0, term);
|
||||
}
|
||||
grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
|
||||
grub_setcolorstate (GRUB_TERM_COLOR_NORMAL);
|
||||
|
||||
grub_free (unicode_str);
|
||||
|
||||
|
|
|
@ -34,13 +34,13 @@ grub_console_setcolorstate (struct grub_term_output *term,
|
|||
{
|
||||
switch (state) {
|
||||
case GRUB_TERM_COLOR_STANDARD:
|
||||
grub_console_cur_color = GRUB_TERM_DEFAULT_STANDARD_COLOR;
|
||||
grub_console_cur_color = GRUB_TERM_DEFAULT_STANDARD_COLOR & 0x7f;
|
||||
break;
|
||||
case GRUB_TERM_COLOR_NORMAL:
|
||||
grub_console_cur_color = term->normal_color;
|
||||
grub_console_cur_color = term->normal_color & 0x7f;
|
||||
break;
|
||||
case GRUB_TERM_COLOR_HIGHLIGHT:
|
||||
grub_console_cur_color = term->highlight_color;
|
||||
grub_console_cur_color = term->highlight_color & 0x7f;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
|
Loading…
Reference in a new issue