vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merged savedefault in

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-11-20 10:55:57 +01:00
commit e242e685f5
17 changed files with 315 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
normal/menu.c
View file

@ -137,6 +137,8 @@ grub_menu_execute_entry(grub_menu_entry_t entry)
return;
}
grub_env_set ("chosen", entry->title);
grub_parser_execute ((char *) entry->sourcecode);
if (grub_errno == GRUB_ERR_NONE && grub_loader_is_loaded ())

26
normal/menu_text.c
View file

@ -237,7 +237,7 @@ grub_menu_init_page (int nested, int edit)
/* Get the entry number from the variable NAME. */
static int
get_entry_number (const char *name)
get_entry_number (grub_menu_t menu, const char *name)
{
char *val;
int entry;
@ -250,6 +250,28 @@ get_entry_number (const char *name)
entry = (int) grub_strtoul (val, 0, 0);
if (grub_errno == GRUB_ERR_BAD_NUMBER)
{
/* See if the variable matches the title of a menu entry. */
grub_menu_entry_t e = menu->entry_list;
int i;
grub_errno = GRUB_ERR_NONE;
for (i = 0; e; i++)
{
if (grub_strcmp (e->title, val) == 0)
{
entry = i;
break;
}
e = e->next;
}
if (! e)
entry = -1;
}
if (grub_errno != GRUB_ERR_NONE)
{
grub_errno = GRUB_ERR_NONE;
@ -291,7 +313,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
first = 0;
default_entry = get_entry_number ("default");
default_entry = get_entry_number (menu, "default");
/* If DEFAULT_ENTRY is not within the menu entries, fall back to
the first entry. */