merge with mainline
This commit is contained in:
BVK Chaitanya
commit
fcf983f8c7
7 changed files with 80 additions and 22 deletions
|
|
@ -131,5 +131,6 @@ grub-core/gnulib/unistd.h
|
|||
grub-core/gnulib/warn-on-use.h
|
||||
grub-core/gnulib/wchar.h
|
||||
grub-core/gnulib/wctype.h
|
||||
grub-core/rs_decoder.S
|
||||
widthspec.bin
|
||||
widthspec.h
|
||||
|
|
|
|||
35
ChangeLog
35
ChangeLog
|
|
@ -1,3 +1,38 @@
|
|||
2010-12-18 Colin Watson <cjwatson@ubuntu.com>
|
||||
|
||||
* grub-core/normal/term.c (print_more): Make \r or \n scroll one
|
||||
line, and other keys scroll an entire page (previous handling was
|
||||
for \r and \n to scroll a page and other keys to scroll two lines).
|
||||
|
||||
2010-12-18 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
* grub-core/loader/i386/multiboot_mbi.c (grub_multiboot_make_mbi):
|
||||
Set ptrdest to correct get_physical_target_address rather than
|
||||
incorrect get_virtual_current_address.
|
||||
|
||||
2010-12-18 kashyap garimella <garimella.kashyap@gmail.com>
|
||||
|
||||
* grub-core/loader/i386/multiboot_mbi.c (grub_multiboot_load): Use
|
||||
correct cat to grub_uint8_t * rather than grub_uint32_t *.
|
||||
|
||||
2010-12-10 Colin Watson <cjwatson@ubuntu.com>
|
||||
|
||||
* .bzrignore: Ignore grub-core/rs_decoder.S.
|
||||
|
||||
2010-12-10 Colin Watson <cjwatson@ubuntu.com>
|
||||
|
||||
* grub-core/gettext/gettext.c (grub_gettext_init_ext): Factor out
|
||||
.mo/.mo.gz opening sequence to ...
|
||||
(grub_mofile_open_lang): ... here.
|
||||
(grub_gettext_init_ext): If opening ll_CC fails, try ll.
|
||||
* util/grub.d/00_header.in (grub_lang): Include country part of
|
||||
locale.
|
||||
Reported by: Mario Limonciello.
|
||||
|
||||
2010-12-09 Robert Millan <rmh@gnu.org>
|
||||
|
||||
* NEWS: Document addition of ZFS support.
|
||||
|
||||
2010-12-04 Colin Watson <cjwatson@ubuntu.com>
|
||||
|
||||
* grub-core/kern/i386/pc/startup.S (grub_console_getkey): Use `>> 1'
|
||||
|
|
|
|||
4
NEWS
4
NEWS
|
|
@ -51,9 +51,7 @@ New in 1.99:
|
|||
|
||||
* Add `sendkey' command (i386-pc only).
|
||||
|
||||
* ZFS support in `grub-install' and `grub-mkconfig'. Note: complete
|
||||
functionality requires external ZFS implementation (available from
|
||||
grub-extras).
|
||||
* ZFS support.
|
||||
|
||||
* Support 1.x versions of mdadm metadata.
|
||||
|
||||
|
|
|
|||
|
|
@ -261,24 +261,16 @@ grub_mofile_open (const char *filename)
|
|||
return fd_mo;
|
||||
}
|
||||
|
||||
/* Returning grub_file_t would be more natural, but grub_mofile_open assigns
|
||||
to fd_mo anyway ... */
|
||||
static void
|
||||
grub_gettext_init_ext (const char *lang)
|
||||
grub_mofile_open_lang (const char *locale_dir, const char *locale)
|
||||
{
|
||||
char *mo_file;
|
||||
char *locale_dir;
|
||||
|
||||
locale_dir = grub_env_get ("locale_dir");
|
||||
if (locale_dir == NULL)
|
||||
{
|
||||
grub_dprintf ("gettext", "locale_dir variable is not set up.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
fd_mo = NULL;
|
||||
|
||||
/* mo_file e.g.: /boot/grub/locale/ca.mo */
|
||||
|
||||
mo_file = grub_xasprintf ("%s/%s.mo", locale_dir, lang);
|
||||
mo_file = grub_xasprintf ("%s/%s.mo", locale_dir, locale);
|
||||
if (!mo_file)
|
||||
return;
|
||||
|
||||
|
|
@ -295,6 +287,38 @@ grub_gettext_init_ext (const char *lang)
|
|||
return;
|
||||
fd_mo = grub_mofile_open (mo_file);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
grub_gettext_init_ext (const char *locale)
|
||||
{
|
||||
char *locale_dir;
|
||||
|
||||
locale_dir = grub_env_get ("locale_dir");
|
||||
if (locale_dir == NULL)
|
||||
{
|
||||
grub_dprintf ("gettext", "locale_dir variable is not set up.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
fd_mo = NULL;
|
||||
|
||||
grub_mofile_open_lang (locale_dir, locale);
|
||||
|
||||
/* ll_CC didn't work, so try ll. */
|
||||
if (fd_mo == NULL)
|
||||
{
|
||||
char *lang = grub_strdup (locale);
|
||||
char *underscore = grub_strchr (lang, '_');
|
||||
|
||||
if (underscore)
|
||||
{
|
||||
*underscore = '\0';
|
||||
grub_mofile_open_lang (locale_dir, lang);
|
||||
}
|
||||
|
||||
grub_free (lang);
|
||||
}
|
||||
|
||||
if (fd_mo)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ grub_multiboot_load (grub_file_t file)
|
|||
}
|
||||
|
||||
if (header->bss_end_addr)
|
||||
grub_memset ((grub_uint32_t *) source + load_size, 0,
|
||||
grub_memset ((grub_uint8_t *) source + load_size, 0,
|
||||
header->bss_end_addr - header->load_addr - load_size);
|
||||
|
||||
grub_multiboot_payload_eip = header->entry_addr;
|
||||
|
|
@ -441,7 +441,7 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
|
|||
if (err)
|
||||
return err;
|
||||
ptrorig = get_virtual_current_address (ch);
|
||||
ptrdest = (grub_addr_t) get_virtual_current_address (ch);
|
||||
ptrdest = get_physical_target_address (ch);
|
||||
|
||||
*target = ptrdest;
|
||||
|
||||
|
|
|
|||
|
|
@ -91,16 +91,16 @@ print_more (void)
|
|||
grub_term_restore_pos (pos);
|
||||
grub_free (pos);
|
||||
|
||||
/* Scroll one lines or an entire page, depending on the key. */
|
||||
/* Scroll one line or an entire page, depending on the key. */
|
||||
|
||||
if (key == '\r' || key =='\n')
|
||||
grub_normal_reset_more ();
|
||||
else
|
||||
{
|
||||
static struct term_state *state;
|
||||
for (state = term_states; state; state = state->next)
|
||||
state->num_lines -= 2;
|
||||
state->num_lines--;
|
||||
}
|
||||
else
|
||||
grub_normal_reset_more ();
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ prefix=@prefix@
|
|||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
locale_dir=`echo ${GRUB_PREFIX}/locale | sed ${transform}`
|
||||
grub_lang=`echo $LANG | cut -d _ -f 1`
|
||||
grub_lang=`echo $LANG | cut -d . -f 1`
|
||||
|
||||
. ${libdir}/grub/grub-mkconfig_lib
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue