2003-01-20 04:13:46 +00:00
|
|
|
/* main.c - the normal mode main routine */
|
|
|
|
/*
|
2004-04-04 13:46:03 +00:00
|
|
|
* GRUB -- GRand Unified Bootloader
|
2006-05-07 Yoshinori K. Okuji <okuji@enbug.org>
Use the environment context in the menu. Remove the commands
"default" and "timeout", and use variables instead.
* normal/menu.c: Include grub/env.h.
(print_entry): Cast TITLE to silence gcc.
(get_timeout): New function.
(set_timeout): Likewise.
(get_entry_number): Likewise.
(run_menu): Use a default entry, a fallback entry and a timeout
in the environment variables "default", "fallback" and
"timeout". Also, tweak the default entry if it is not within the
current menu entries.
(grub_menu_run): Use a fallback entry in the environment variable
"fallback".
* normal/main.c (read_config_file): Do not initialize
NEWMENU->DEFAULT_ENTRY, NEWMENU->FALLBACK_ENTRY or
NEWMENU->TIMEOUT.
(grub_normal_execute): Use a data slot to store the menu.
* include/grub/normal.h (struct grub_menu): Removed default_entry,
fallback_entry and timeout.
(struct grub_menu_list): Removed.
(grub_menu_list_t): Likewise.
(struct grub_context): Likewise.
(grub_context_t): Likewise.
(grub_context_get): Likewise.
(grub_context_get_current_menu): Likewise.
(grub_context_push_menu): Likewise.
(grub_context_pop_menu): Likewise.
(grub_default_init): Likewise.
(grub_default_fini): Likewise.
(grub_timeout_init): Likewise.
(grub_timeout_fini): Likewise.
* conf/sparc64-ieee1275.rmk (pkgdata_MODULES): Removed default.mod
and timeout.mod.
(normal_mod_SOURCES): Removed normal/context.c.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Removed
commands/default.c, commands/timeout.c and normal/context.c.
(normal_mod_SOURCES): Removed normal/context.c.
* conf/i386-pc.rmk (grub_emu_SOURCES): Removed commands/default.c,
commands/timeout.c and normal/context.c.
(normal_mod_SOURCES): Removed normal/context.c.
* conf/i386-efi.rmk (grub_emu_SOURCES): Removed
commands/default.c, commands/timeout.c and normal/context.c.
(normal_mod_SOURCES): Removed normal/context.c.
* conf/common.rmk (pkgdata_MODULES): Removed default.mod and
timeout.mod.
(default_mod_SOURCES): Removed.
(default_mod_CFLAGS): Likewise.
(default_mod_LDFLAGS): Likewise.
(timeout_mod_SOURCES): Removed.
(timeout_mod_CFLAGS): Likewise.
(timeout_mod_LDFLAGS): Likewise.
* DISTLIST: Removed commands/default.c, commands/timeout.c and
normal/context.c.
* commands/default.c: Removed.
* commands/timeout.c: Likewise.
* normal/context.c: Likewise.
2006-05-07 18:28:24 +00:00
|
|
|
* Copyright (C) 2000,2001,2002,2003,2005,2006 Free Software Foundation, Inc.
|
2003-01-20 04:13:46 +00:00
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
*/
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
#include <grub/kernel.h>
|
|
|
|
#include <grub/normal.h>
|
|
|
|
#include <grub/dl.h>
|
|
|
|
#include <grub/rescue.h>
|
|
|
|
#include <grub/misc.h>
|
|
|
|
#include <grub/file.h>
|
|
|
|
#include <grub/mm.h>
|
|
|
|
#include <grub/term.h>
|
|
|
|
#include <grub/env.h>
|
2006-01-17 09:50:47 +00:00
|
|
|
#include <grub/parser.h>
|
|
|
|
#include <grub/script.h>
|
2003-01-20 04:13:46 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_jmp_buf grub_exit_env;
|
2003-01-20 04:13:46 +00:00
|
|
|
|
2005-07-03 18:06:56 +00:00
|
|
|
static grub_fs_module_list_t fs_module_list = 0;
|
|
|
|
|
2006-01-17 09:50:47 +00:00
|
|
|
/* The menu to which the new entries are added by the parser. */
|
|
|
|
static grub_menu_t current_menu = 0;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
#define GRUB_DEFAULT_HISTORY_SIZE 50
|
2003-12-03 19:17:27 +00:00
|
|
|
|
2003-01-20 04:13:46 +00:00
|
|
|
/* Read a line from the file FILE. */
|
2006-09-22 20:23:00 +00:00
|
|
|
static char *
|
|
|
|
get_line (grub_file_t file)
|
2003-01-20 04:13:46 +00:00
|
|
|
{
|
|
|
|
char c;
|
|
|
|
int pos = 0;
|
|
|
|
int literal = 0;
|
|
|
|
int comment = 0;
|
2006-09-22 20:23:00 +00:00
|
|
|
char *cmdline;
|
|
|
|
int max_len = 64;
|
|
|
|
|
|
|
|
/* Initially locate some space. */
|
|
|
|
cmdline = grub_malloc (max_len);
|
|
|
|
if (! cmdline)
|
|
|
|
return 0;
|
2003-01-20 04:13:46 +00:00
|
|
|
|
|
|
|
while (1)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
if (grub_file_read (file, &c, 1) != 1)
|
2003-01-20 04:13:46 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
/* Skip all carriage returns. */
|
|
|
|
if (c == '\r')
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Replace tabs with spaces. */
|
|
|
|
if (c == '\t')
|
|
|
|
c = ' ';
|
|
|
|
|
|
|
|
/* The previous is a backslash, then... */
|
|
|
|
if (literal)
|
|
|
|
{
|
|
|
|
/* If it is a newline, replace it with a space and continue. */
|
|
|
|
if (c == '\n')
|
|
|
|
{
|
|
|
|
c = ' ';
|
|
|
|
|
|
|
|
/* Go back to overwrite the backslash. */
|
|
|
|
if (pos > 0)
|
|
|
|
pos--;
|
|
|
|
}
|
|
|
|
|
|
|
|
literal = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (c == '\\')
|
|
|
|
literal = 1;
|
|
|
|
|
|
|
|
if (comment)
|
|
|
|
{
|
|
|
|
if (c == '\n')
|
|
|
|
comment = 0;
|
|
|
|
}
|
|
|
|
else if (pos == 0)
|
|
|
|
{
|
|
|
|
if (c == '#')
|
|
|
|
comment = 1;
|
2004-04-04 13:46:03 +00:00
|
|
|
else if (! grub_isspace (c))
|
2003-01-20 04:13:46 +00:00
|
|
|
cmdline[pos++] = c;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (c == '\n')
|
|
|
|
break;
|
|
|
|
|
2006-09-22 20:23:00 +00:00
|
|
|
if (pos >= max_len)
|
|
|
|
{
|
|
|
|
char *old_cmdline = cmdline;
|
|
|
|
max_len = max_len * 2;
|
|
|
|
cmdline = grub_realloc (cmdline, max_len);
|
|
|
|
if (! cmdline)
|
|
|
|
{
|
|
|
|
grub_free (old_cmdline);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
cmdline[pos++] = c;
|
2003-01-20 04:13:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
cmdline[pos] = '\0';
|
2006-09-22 20:23:00 +00:00
|
|
|
|
|
|
|
/* If the buffer is empty, don't return anything at all. */
|
|
|
|
if (pos == 0)
|
|
|
|
{
|
|
|
|
grub_free (cmdline);
|
|
|
|
cmdline = 0;
|
|
|
|
}
|
2003-01-20 04:13:46 +00:00
|
|
|
|
2006-09-22 20:23:00 +00:00
|
|
|
return cmdline;
|
2003-01-20 04:13:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2004-04-04 13:46:03 +00:00
|
|
|
free_menu (grub_menu_t menu)
|
2003-01-20 04:13:46 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_menu_entry_t entry = menu->entry_list;
|
2003-01-20 04:13:46 +00:00
|
|
|
|
|
|
|
while (entry)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_menu_entry_t next_entry = entry->next;
|
2003-01-20 04:13:46 +00:00
|
|
|
|
2006-01-17 09:50:47 +00:00
|
|
|
grub_script_free (entry->commands);
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_free ((void *) entry->title);
|
2006-01-17 09:50:47 +00:00
|
|
|
grub_free ((void *) entry->sourcecode);
|
2003-01-20 04:13:46 +00:00
|
|
|
entry = next_entry;
|
|
|
|
}
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_free (menu);
|
2003-01-20 04:13:46 +00:00
|
|
|
}
|
|
|
|
|
2006-01-17 09:50:47 +00:00
|
|
|
grub_err_t
|
|
|
|
grub_normal_menu_addentry (const char *title, struct grub_script *script,
|
|
|
|
const char *sourcecode)
|
|
|
|
{
|
|
|
|
const char *menutitle;
|
|
|
|
grub_menu_entry_t *last = ¤t_menu->entry_list;
|
|
|
|
|
|
|
|
menutitle = grub_strdup (title);
|
|
|
|
if (! menutitle)
|
|
|
|
return grub_errno;
|
|
|
|
|
|
|
|
/* Add the menu entry at the end of the list. */
|
|
|
|
while (*last)
|
|
|
|
last = &(*last)->next;
|
|
|
|
|
|
|
|
*last = grub_malloc (sizeof (**last));
|
|
|
|
if (! *last)
|
|
|
|
{
|
|
|
|
grub_free ((void *) menutitle);
|
|
|
|
grub_free ((void *) sourcecode);
|
|
|
|
return grub_errno;
|
|
|
|
}
|
|
|
|
|
|
|
|
(*last)->commands = script;
|
|
|
|
(*last)->title = menutitle;
|
|
|
|
(*last)->next = 0;
|
|
|
|
(*last)->sourcecode = sourcecode;
|
|
|
|
|
2006-04-01 14:41:34 +00:00
|
|
|
current_menu->size++;
|
|
|
|
|
2006-01-17 09:50:47 +00:00
|
|
|
return GRUB_ERR_NONE;
|
|
|
|
}
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
static grub_menu_t
|
2003-01-20 04:13:46 +00:00
|
|
|
read_config_file (const char *config)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_file_t file;
|
2006-01-17 09:50:47 +00:00
|
|
|
auto grub_err_t getline (char **line);
|
|
|
|
int currline = 0;
|
2006-04-16 18:02:42 +00:00
|
|
|
int errors = 0;
|
2003-01-20 04:13:46 +00:00
|
|
|
|
2006-01-17 09:50:47 +00:00
|
|
|
grub_err_t getline (char **line)
|
|
|
|
{
|
|
|
|
currline++;
|
|
|
|
|
2006-09-22 20:23:00 +00:00
|
|
|
*line = get_line (file);
|
2006-01-17 09:50:47 +00:00
|
|
|
if (! *line)
|
|
|
|
return grub_errno;
|
|
|
|
|
|
|
|
return GRUB_ERR_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
grub_menu_t newmenu;
|
|
|
|
|
|
|
|
newmenu = grub_malloc (sizeof (*newmenu));
|
|
|
|
if (! newmenu)
|
|
|
|
return 0;
|
|
|
|
newmenu->size = 0;
|
|
|
|
newmenu->entry_list = 0;
|
|
|
|
current_menu = newmenu;
|
|
|
|
|
2003-01-20 04:13:46 +00:00
|
|
|
/* Try to open the config file. */
|
2004-04-04 13:46:03 +00:00
|
|
|
file = grub_file_open (config);
|
2003-01-20 04:13:46 +00:00
|
|
|
if (! file)
|
|
|
|
return 0;
|
|
|
|
|
2006-09-22 20:23:00 +00:00
|
|
|
while (1)
|
2003-01-20 04:13:46 +00:00
|
|
|
{
|
2006-01-17 09:50:47 +00:00
|
|
|
struct grub_script *parsed_script;
|
2006-04-16 18:02:42 +00:00
|
|
|
int startline;
|
2006-09-22 20:23:00 +00:00
|
|
|
char *cmdline;
|
|
|
|
|
|
|
|
cmdline = get_line (file);
|
|
|
|
if (!cmdline)
|
|
|
|
break;
|
|
|
|
|
2006-04-16 18:02:42 +00:00
|
|
|
startline = ++currline;
|
2003-01-20 04:13:46 +00:00
|
|
|
|
2006-01-17 09:50:47 +00:00
|
|
|
/* Execute the script, line for line. */
|
|
|
|
parsed_script = grub_script_parse (cmdline, getline);
|
2003-01-20 04:13:46 +00:00
|
|
|
|
2006-09-22 20:23:00 +00:00
|
|
|
grub_free (cmdline);
|
|
|
|
|
2006-01-17 09:50:47 +00:00
|
|
|
if (! parsed_script)
|
2003-01-20 04:13:46 +00:00
|
|
|
{
|
2006-04-16 18:02:42 +00:00
|
|
|
grub_printf ("(line %d-%d)\n", startline, currline);
|
|
|
|
errors++;
|
|
|
|
continue;
|
2006-01-17 09:50:47 +00:00
|
|
|
}
|
2003-01-20 04:13:46 +00:00
|
|
|
|
2006-01-17 09:50:47 +00:00
|
|
|
/* Execute the command(s). */
|
|
|
|
grub_script_execute (parsed_script);
|
2003-01-20 04:13:46 +00:00
|
|
|
|
2006-01-17 09:50:47 +00:00
|
|
|
/* The parsed script was executed, throw it away. */
|
|
|
|
grub_script_free (parsed_script);
|
2003-01-20 04:13:46 +00:00
|
|
|
}
|
|
|
|
|
2006-01-17 09:50:47 +00:00
|
|
|
grub_file_close (file);
|
2006-04-16 18:02:42 +00:00
|
|
|
|
|
|
|
if (errors > 0)
|
|
|
|
{
|
|
|
|
/* Wait until the user pushes any key so that the user can
|
|
|
|
see what happened. */
|
|
|
|
grub_printf ("\nPress any key to continue...");
|
|
|
|
(void) grub_getkey ();
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If the menu is empty, just drop it. */
|
|
|
|
if (current_menu->size == 0)
|
|
|
|
{
|
|
|
|
grub_free (current_menu);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-04-01 14:41:34 +00:00
|
|
|
return newmenu;
|
2003-01-20 04:13:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* This starts the normal mode. */
|
|
|
|
void
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_enter_normal_mode (const char *config)
|
2003-01-20 04:13:46 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
if (grub_setjmp (grub_exit_env) == 0)
|
|
|
|
grub_normal_execute (config, 0);
|
2003-01-20 04:13:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Initialize the screen. */
|
|
|
|
void
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_normal_init_page (void)
|
2003-01-20 04:13:46 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_cls ();
|
|
|
|
grub_printf ("\n\
|
2004-08-21 13:54:22 +00:00
|
|
|
GNU GRUB version %s\n\n",
|
2003-01-20 04:13:46 +00:00
|
|
|
PACKAGE_VERSION);
|
|
|
|
}
|
|
|
|
|
2005-03-08 01:01:06 +00:00
|
|
|
/* Read the file command.lst for auto-loading. */
|
|
|
|
static void
|
|
|
|
read_command_list (void)
|
|
|
|
{
|
|
|
|
const char *prefix;
|
|
|
|
|
|
|
|
prefix = grub_env_get ("prefix");
|
|
|
|
if (prefix)
|
|
|
|
{
|
|
|
|
char *filename;
|
|
|
|
|
|
|
|
filename = grub_malloc (grub_strlen (prefix) + sizeof ("/command.lst"));
|
|
|
|
if (filename)
|
|
|
|
{
|
|
|
|
grub_file_t file;
|
|
|
|
|
|
|
|
grub_sprintf (filename, "%s/command.lst", prefix);
|
|
|
|
file = grub_file_open (filename);
|
|
|
|
if (file)
|
|
|
|
{
|
2006-09-22 20:23:00 +00:00
|
|
|
while (1)
|
2005-03-08 01:01:06 +00:00
|
|
|
{
|
|
|
|
char *p;
|
|
|
|
grub_command_t cmd;
|
2006-09-22 20:23:00 +00:00
|
|
|
char *buf = get_line (file);
|
|
|
|
|
|
|
|
if (! buf)
|
|
|
|
break;
|
2005-03-08 01:01:06 +00:00
|
|
|
|
|
|
|
if (! grub_isgraph (buf[0]))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
p = grub_strchr (buf, ':');
|
|
|
|
if (! p)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
*p = '\0';
|
|
|
|
while (*++p == ' ')
|
|
|
|
;
|
|
|
|
|
|
|
|
if (! grub_isgraph (*p))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
cmd = grub_register_command (buf, 0,
|
|
|
|
GRUB_COMMAND_FLAG_NOT_LOADED,
|
|
|
|
0, 0, 0);
|
|
|
|
if (! cmd)
|
2006-09-22 20:23:00 +00:00
|
|
|
{
|
|
|
|
grub_free (buf);
|
|
|
|
continue;
|
|
|
|
}
|
2005-03-08 01:01:06 +00:00
|
|
|
|
|
|
|
cmd->module_name = grub_strdup (p);
|
|
|
|
if (! cmd->module_name)
|
|
|
|
grub_unregister_command (buf);
|
2006-09-22 20:23:00 +00:00
|
|
|
grub_free (buf);
|
2005-03-08 01:01:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
grub_file_close (file);
|
|
|
|
}
|
|
|
|
|
|
|
|
grub_free (filename);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Ignore errors. */
|
|
|
|
grub_errno = GRUB_ERR_NONE;
|
|
|
|
}
|
|
|
|
|
2005-07-03 18:06:56 +00:00
|
|
|
/* The auto-loading hook for filesystems. */
|
|
|
|
static int
|
|
|
|
autoload_fs_module (void)
|
|
|
|
{
|
|
|
|
grub_fs_module_list_t p;
|
|
|
|
|
|
|
|
while ((p = fs_module_list) != 0)
|
|
|
|
{
|
|
|
|
if (! grub_dl_get (p->name) && grub_dl_load (p->name))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
fs_module_list = p->next;
|
|
|
|
grub_free (p->name);
|
|
|
|
grub_free (p);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Read the file fs.lst for auto-loading. */
|
|
|
|
static void
|
|
|
|
read_fs_list (void)
|
|
|
|
{
|
|
|
|
const char *prefix;
|
|
|
|
|
|
|
|
prefix = grub_env_get ("prefix");
|
|
|
|
if (prefix)
|
|
|
|
{
|
|
|
|
char *filename;
|
|
|
|
|
|
|
|
filename = grub_malloc (grub_strlen (prefix) + sizeof ("/fs.lst"));
|
|
|
|
if (filename)
|
|
|
|
{
|
|
|
|
grub_file_t file;
|
|
|
|
|
|
|
|
grub_sprintf (filename, "%s/fs.lst", prefix);
|
|
|
|
file = grub_file_open (filename);
|
|
|
|
if (file)
|
|
|
|
{
|
2006-09-22 20:23:00 +00:00
|
|
|
while (1)
|
2005-07-03 18:06:56 +00:00
|
|
|
{
|
2006-09-22 20:23:00 +00:00
|
|
|
char *buf;
|
|
|
|
char *p;
|
|
|
|
char *q;
|
2005-07-03 18:06:56 +00:00
|
|
|
grub_fs_module_list_t fs_mod;
|
|
|
|
|
2006-09-22 20:23:00 +00:00
|
|
|
buf = get_line (file);
|
|
|
|
if (! buf)
|
|
|
|
break;
|
|
|
|
|
|
|
|
p = buf;
|
|
|
|
q = buf + grub_strlen (buf) - 1;
|
|
|
|
|
2005-07-03 18:06:56 +00:00
|
|
|
/* Ignore space. */
|
|
|
|
while (grub_isspace (*p))
|
|
|
|
p++;
|
|
|
|
|
|
|
|
while (p < q && grub_isspace (*q))
|
|
|
|
*q-- = '\0';
|
|
|
|
|
|
|
|
/* If the line is empty, skip it. */
|
|
|
|
if (p >= q)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
fs_mod = grub_malloc (sizeof (*fs_mod));
|
|
|
|
if (! fs_mod)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
fs_mod->name = grub_strdup (p);
|
|
|
|
if (! fs_mod->name)
|
|
|
|
{
|
|
|
|
grub_free (fs_mod);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
fs_mod->next = fs_module_list;
|
|
|
|
fs_module_list = fs_mod;
|
|
|
|
}
|
|
|
|
|
|
|
|
grub_file_close (file);
|
|
|
|
}
|
|
|
|
|
|
|
|
grub_free (filename);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Ignore errors. */
|
|
|
|
grub_errno = GRUB_ERR_NONE;
|
|
|
|
|
|
|
|
/* Set the hook. */
|
|
|
|
grub_fs_autoload_hook = autoload_fs_module;
|
|
|
|
}
|
|
|
|
|
2003-01-20 04:13:46 +00:00
|
|
|
/* Read the config file CONFIG and execute the menu interface or
|
|
|
|
the command-line interface. */
|
|
|
|
void
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_normal_execute (const char *config, int nested)
|
2003-01-20 04:13:46 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_menu_t menu = 0;
|
2003-01-20 04:13:46 +00:00
|
|
|
|
2005-08-14 19:36:55 +00:00
|
|
|
read_command_list ();
|
|
|
|
read_fs_list ();
|
|
|
|
|
2003-01-20 04:13:46 +00:00
|
|
|
if (config)
|
|
|
|
{
|
|
|
|
menu = read_config_file (config);
|
|
|
|
|
|
|
|
/* Ignore any error. */
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_errno = GRUB_ERR_NONE;
|
2003-01-20 04:13:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (menu)
|
2005-02-27 21:19:06 +00:00
|
|
|
{
|
2006-05-07 Yoshinori K. Okuji <okuji@enbug.org>
Use the environment context in the menu. Remove the commands
"default" and "timeout", and use variables instead.
* normal/menu.c: Include grub/env.h.
(print_entry): Cast TITLE to silence gcc.
(get_timeout): New function.
(set_timeout): Likewise.
(get_entry_number): Likewise.
(run_menu): Use a default entry, a fallback entry and a timeout
in the environment variables "default", "fallback" and
"timeout". Also, tweak the default entry if it is not within the
current menu entries.
(grub_menu_run): Use a fallback entry in the environment variable
"fallback".
* normal/main.c (read_config_file): Do not initialize
NEWMENU->DEFAULT_ENTRY, NEWMENU->FALLBACK_ENTRY or
NEWMENU->TIMEOUT.
(grub_normal_execute): Use a data slot to store the menu.
* include/grub/normal.h (struct grub_menu): Removed default_entry,
fallback_entry and timeout.
(struct grub_menu_list): Removed.
(grub_menu_list_t): Likewise.
(struct grub_context): Likewise.
(grub_context_t): Likewise.
(grub_context_get): Likewise.
(grub_context_get_current_menu): Likewise.
(grub_context_push_menu): Likewise.
(grub_context_pop_menu): Likewise.
(grub_default_init): Likewise.
(grub_default_fini): Likewise.
(grub_timeout_init): Likewise.
(grub_timeout_fini): Likewise.
* conf/sparc64-ieee1275.rmk (pkgdata_MODULES): Removed default.mod
and timeout.mod.
(normal_mod_SOURCES): Removed normal/context.c.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Removed
commands/default.c, commands/timeout.c and normal/context.c.
(normal_mod_SOURCES): Removed normal/context.c.
* conf/i386-pc.rmk (grub_emu_SOURCES): Removed commands/default.c,
commands/timeout.c and normal/context.c.
(normal_mod_SOURCES): Removed normal/context.c.
* conf/i386-efi.rmk (grub_emu_SOURCES): Removed
commands/default.c, commands/timeout.c and normal/context.c.
(normal_mod_SOURCES): Removed normal/context.c.
* conf/common.rmk (pkgdata_MODULES): Removed default.mod and
timeout.mod.
(default_mod_SOURCES): Removed.
(default_mod_CFLAGS): Likewise.
(default_mod_LDFLAGS): Likewise.
(timeout_mod_SOURCES): Removed.
(timeout_mod_CFLAGS): Likewise.
(timeout_mod_LDFLAGS): Likewise.
* DISTLIST: Removed commands/default.c, commands/timeout.c and
normal/context.c.
* commands/default.c: Removed.
* commands/timeout.c: Likewise.
* normal/context.c: Likewise.
2006-05-07 18:28:24 +00:00
|
|
|
grub_env_set_data_slot ("menu", menu);
|
2005-02-27 21:19:06 +00:00
|
|
|
grub_menu_run (menu, nested);
|
2006-05-07 Yoshinori K. Okuji <okuji@enbug.org>
Use the environment context in the menu. Remove the commands
"default" and "timeout", and use variables instead.
* normal/menu.c: Include grub/env.h.
(print_entry): Cast TITLE to silence gcc.
(get_timeout): New function.
(set_timeout): Likewise.
(get_entry_number): Likewise.
(run_menu): Use a default entry, a fallback entry and a timeout
in the environment variables "default", "fallback" and
"timeout". Also, tweak the default entry if it is not within the
current menu entries.
(grub_menu_run): Use a fallback entry in the environment variable
"fallback".
* normal/main.c (read_config_file): Do not initialize
NEWMENU->DEFAULT_ENTRY, NEWMENU->FALLBACK_ENTRY or
NEWMENU->TIMEOUT.
(grub_normal_execute): Use a data slot to store the menu.
* include/grub/normal.h (struct grub_menu): Removed default_entry,
fallback_entry and timeout.
(struct grub_menu_list): Removed.
(grub_menu_list_t): Likewise.
(struct grub_context): Likewise.
(grub_context_t): Likewise.
(grub_context_get): Likewise.
(grub_context_get_current_menu): Likewise.
(grub_context_push_menu): Likewise.
(grub_context_pop_menu): Likewise.
(grub_default_init): Likewise.
(grub_default_fini): Likewise.
(grub_timeout_init): Likewise.
(grub_timeout_fini): Likewise.
* conf/sparc64-ieee1275.rmk (pkgdata_MODULES): Removed default.mod
and timeout.mod.
(normal_mod_SOURCES): Removed normal/context.c.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Removed
commands/default.c, commands/timeout.c and normal/context.c.
(normal_mod_SOURCES): Removed normal/context.c.
* conf/i386-pc.rmk (grub_emu_SOURCES): Removed commands/default.c,
commands/timeout.c and normal/context.c.
(normal_mod_SOURCES): Removed normal/context.c.
* conf/i386-efi.rmk (grub_emu_SOURCES): Removed
commands/default.c, commands/timeout.c and normal/context.c.
(normal_mod_SOURCES): Removed normal/context.c.
* conf/common.rmk (pkgdata_MODULES): Removed default.mod and
timeout.mod.
(default_mod_SOURCES): Removed.
(default_mod_CFLAGS): Likewise.
(default_mod_LDFLAGS): Likewise.
(timeout_mod_SOURCES): Removed.
(timeout_mod_CFLAGS): Likewise.
(timeout_mod_LDFLAGS): Likewise.
* DISTLIST: Removed commands/default.c, commands/timeout.c and
normal/context.c.
* commands/default.c: Removed.
* commands/timeout.c: Likewise.
* normal/context.c: Likewise.
2006-05-07 18:28:24 +00:00
|
|
|
grub_env_unset_data_slot ("menu");
|
2005-02-27 21:19:06 +00:00
|
|
|
free_menu (menu);
|
|
|
|
}
|
2003-01-20 04:13:46 +00:00
|
|
|
else
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_cmdline_run (nested);
|
2003-01-20 04:13:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Enter normal mode from rescue mode. */
|
|
|
|
static void
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_rescue_cmd_normal (int argc, char *argv[])
|
2003-01-20 04:13:46 +00:00
|
|
|
{
|
|
|
|
if (argc == 0)
|
|
|
|
{
|
2005-07-18 20:30:37 +00:00
|
|
|
/* Guess the config filename. It is necessary to make CONFIG static,
|
|
|
|
so that it won't get broken by longjmp. */
|
|
|
|
static char *config;
|
2003-01-20 04:13:46 +00:00
|
|
|
const char *prefix;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
prefix = grub_env_get ("prefix");
|
2003-01-20 04:13:46 +00:00
|
|
|
if (prefix)
|
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
config = grub_malloc (grub_strlen (prefix) + sizeof ("/grub.cfg"));
|
2003-01-20 04:13:46 +00:00
|
|
|
if (! config)
|
|
|
|
return;
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_sprintf (config, "%s/grub.cfg", prefix);
|
|
|
|
grub_enter_normal_mode (config);
|
|
|
|
grub_free (config);
|
2003-01-20 04:13:46 +00:00
|
|
|
}
|
|
|
|
else
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_enter_normal_mode (0);
|
2003-01-20 04:13:46 +00:00
|
|
|
}
|
|
|
|
else
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_enter_normal_mode (argv[0]);
|
2003-01-20 04:13:46 +00:00
|
|
|
}
|
|
|
|
|
2005-11-13 Marco Gerards <mgerards@xs4all.nl>
* geninit.sh: New file.
* geninitheader.sh: Likewise.
* commands/boot.c (grub_boot_init, grub_boot_fini): Removed.
* commands/cat.c (grub_cat_init, grub_cat_fini): Likewise.
* commands/cmp.c (grub_cmp_init, grub_cmp_fini): Likewise.
* commands/configfile.c (grub_configfile_init)
(grub_configfile_fini): Likewise.
* commands/default.c (grub_default_init, grub_default_fini):
Likewise.
* commands/help.c (grub_help_init, grub_help_fini): Likewise.
* commands/ls.c (grub_ls_init, grub_ls_fini): Likewise.
* commands/search.c (grub_search_init, grub_search_fini): Likewise.
* commands/terminal.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* commands/test.c (grub_test_init, grub_test_fini): Likewise.
* commands/timeout.c (grub_timeout_init, grub_timeout_fini):
Likewise.
* commands/i386/pc/halt.c (grub_halt_init, grub_halt_fini): Likewise.
* commands/iee1275/halt.c (grub_halt_init, grub_halt_fini):
Likewise.
* commands/i386/pc/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* commands/iee1275/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* disk/loopback.c (grub_loop_init, grub_loop_fini): Likewise.
* fs/affs.c (grub_affs_init, grub_affs_fini): Likewise.
* fs/ext2.c (grub_ext2_init, grub_ext2_fini): Likewise.
* fs/fat.c (grub_fat_init, grub_fat_fini): Likewise.
* fs/hfs.c (grub_hfs_init, grub_hfs_fini): Likewise.
* fs/iso9660.c (grub_iso9660_init, grub_iso9660_fini): Likewise.
* fs/jfs.c (grub_jfs_init, grub_jfs_fini): Likewise.
* fs/minix.c (grub_minix_init, grub_minix_fini): Likewise.
* fs/sfs.c (grub_sfs_init, grub_sfs_fini): Likewise.
* fs/ufs.c (grub_ufs_init, grub_ufs_fini): Likewise.
* fs/xfs.c (grub_xfs_init, grub_xfs_fini): Likewise.
* normal/main.c (grub_normal_init, grub_normal_fini): Likewise.
* partmap/amiga.c (grub_amiga_partition_map_init)
(grub_amiga_partition_map_fini): Likewise.
* partmap/apple.c (grub_apple_partition_map_init)
(grub_apple_partition_map_fini): Likewise.
* partmap/pc.c (grub_pc_partition_map_init)
(grub_pc_partition_map_fini): Likewise.
* partmap/sun.c (grub_sun_partition_map_init,
grub_sun_partition_map_fini): Likewise.
* term/terminfo.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* util/grub-emu.c: Include <grub_modules_init.h>.
(main): Don't initialize and de-initialize any modules directly,
use `grub_init_all' and `grub_fini_all' instead.
* term/i386/pc/vesafb.c (grub_vesafb_init): Renamed to
`grub_vesafb_mod_init'.
(grub_vesafb_fini): Renamed to `grub_vesafb_mod_fini'. Updated
all users.
* term/i386/pc/vga.c (grub_vga_init): Renamed to
`grub_vga_mod_init'. Updated all users.
(grub_vga_fini): Renamed to `grub_vga_mod_fini'.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `grub_emu_init.c'.
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c): New
rules.
* include/grub/dl.h (GRUB_MOD_INIT): Add argument `name'.
Generate a function to initialize the module in utilities.
Updated all callers.
(GRUB_MOD_FINI): Add argument `name'. Generate a function to
initialize the module in utilities. Updated all callers.
2005-11-13 15:47:09 +00:00
|
|
|
GRUB_MOD_INIT(normal)
|
2003-01-20 04:13:46 +00:00
|
|
|
{
|
|
|
|
/* Normal mode shouldn't be unloaded. */
|
2005-11-13 Marco Gerards <mgerards@xs4all.nl>
* geninit.sh: New file.
* geninitheader.sh: Likewise.
* commands/boot.c (grub_boot_init, grub_boot_fini): Removed.
* commands/cat.c (grub_cat_init, grub_cat_fini): Likewise.
* commands/cmp.c (grub_cmp_init, grub_cmp_fini): Likewise.
* commands/configfile.c (grub_configfile_init)
(grub_configfile_fini): Likewise.
* commands/default.c (grub_default_init, grub_default_fini):
Likewise.
* commands/help.c (grub_help_init, grub_help_fini): Likewise.
* commands/ls.c (grub_ls_init, grub_ls_fini): Likewise.
* commands/search.c (grub_search_init, grub_search_fini): Likewise.
* commands/terminal.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* commands/test.c (grub_test_init, grub_test_fini): Likewise.
* commands/timeout.c (grub_timeout_init, grub_timeout_fini):
Likewise.
* commands/i386/pc/halt.c (grub_halt_init, grub_halt_fini): Likewise.
* commands/iee1275/halt.c (grub_halt_init, grub_halt_fini):
Likewise.
* commands/i386/pc/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* commands/iee1275/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* disk/loopback.c (grub_loop_init, grub_loop_fini): Likewise.
* fs/affs.c (grub_affs_init, grub_affs_fini): Likewise.
* fs/ext2.c (grub_ext2_init, grub_ext2_fini): Likewise.
* fs/fat.c (grub_fat_init, grub_fat_fini): Likewise.
* fs/hfs.c (grub_hfs_init, grub_hfs_fini): Likewise.
* fs/iso9660.c (grub_iso9660_init, grub_iso9660_fini): Likewise.
* fs/jfs.c (grub_jfs_init, grub_jfs_fini): Likewise.
* fs/minix.c (grub_minix_init, grub_minix_fini): Likewise.
* fs/sfs.c (grub_sfs_init, grub_sfs_fini): Likewise.
* fs/ufs.c (grub_ufs_init, grub_ufs_fini): Likewise.
* fs/xfs.c (grub_xfs_init, grub_xfs_fini): Likewise.
* normal/main.c (grub_normal_init, grub_normal_fini): Likewise.
* partmap/amiga.c (grub_amiga_partition_map_init)
(grub_amiga_partition_map_fini): Likewise.
* partmap/apple.c (grub_apple_partition_map_init)
(grub_apple_partition_map_fini): Likewise.
* partmap/pc.c (grub_pc_partition_map_init)
(grub_pc_partition_map_fini): Likewise.
* partmap/sun.c (grub_sun_partition_map_init,
grub_sun_partition_map_fini): Likewise.
* term/terminfo.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* util/grub-emu.c: Include <grub_modules_init.h>.
(main): Don't initialize and de-initialize any modules directly,
use `grub_init_all' and `grub_fini_all' instead.
* term/i386/pc/vesafb.c (grub_vesafb_init): Renamed to
`grub_vesafb_mod_init'.
(grub_vesafb_fini): Renamed to `grub_vesafb_mod_fini'. Updated
all users.
* term/i386/pc/vga.c (grub_vga_init): Renamed to
`grub_vga_mod_init'. Updated all users.
(grub_vga_fini): Renamed to `grub_vga_mod_fini'.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `grub_emu_init.c'.
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c): New
rules.
* include/grub/dl.h (GRUB_MOD_INIT): Add argument `name'.
Generate a function to initialize the module in utilities.
Updated all callers.
(GRUB_MOD_FINI): Add argument `name'. Generate a function to
initialize the module in utilities. Updated all callers.
2005-11-13 15:47:09 +00:00
|
|
|
if (mod)
|
|
|
|
grub_dl_ref (mod);
|
2003-01-20 04:13:46 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_set_history (GRUB_DEFAULT_HISTORY_SIZE);
|
2003-12-03 19:17:27 +00:00
|
|
|
|
2003-01-20 04:13:46 +00:00
|
|
|
/* Register a command "normal" for the rescue mode. */
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_rescue_register_command ("normal", grub_rescue_cmd_normal,
|
2003-01-20 04:13:46 +00:00
|
|
|
"enter normal mode");
|
|
|
|
|
|
|
|
/* This registers some built-in commands. */
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_command_init ();
|
2003-01-20 04:13:46 +00:00
|
|
|
}
|
|
|
|
|
2005-11-13 Marco Gerards <mgerards@xs4all.nl>
* geninit.sh: New file.
* geninitheader.sh: Likewise.
* commands/boot.c (grub_boot_init, grub_boot_fini): Removed.
* commands/cat.c (grub_cat_init, grub_cat_fini): Likewise.
* commands/cmp.c (grub_cmp_init, grub_cmp_fini): Likewise.
* commands/configfile.c (grub_configfile_init)
(grub_configfile_fini): Likewise.
* commands/default.c (grub_default_init, grub_default_fini):
Likewise.
* commands/help.c (grub_help_init, grub_help_fini): Likewise.
* commands/ls.c (grub_ls_init, grub_ls_fini): Likewise.
* commands/search.c (grub_search_init, grub_search_fini): Likewise.
* commands/terminal.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* commands/test.c (grub_test_init, grub_test_fini): Likewise.
* commands/timeout.c (grub_timeout_init, grub_timeout_fini):
Likewise.
* commands/i386/pc/halt.c (grub_halt_init, grub_halt_fini): Likewise.
* commands/iee1275/halt.c (grub_halt_init, grub_halt_fini):
Likewise.
* commands/i386/pc/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* commands/iee1275/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* disk/loopback.c (grub_loop_init, grub_loop_fini): Likewise.
* fs/affs.c (grub_affs_init, grub_affs_fini): Likewise.
* fs/ext2.c (grub_ext2_init, grub_ext2_fini): Likewise.
* fs/fat.c (grub_fat_init, grub_fat_fini): Likewise.
* fs/hfs.c (grub_hfs_init, grub_hfs_fini): Likewise.
* fs/iso9660.c (grub_iso9660_init, grub_iso9660_fini): Likewise.
* fs/jfs.c (grub_jfs_init, grub_jfs_fini): Likewise.
* fs/minix.c (grub_minix_init, grub_minix_fini): Likewise.
* fs/sfs.c (grub_sfs_init, grub_sfs_fini): Likewise.
* fs/ufs.c (grub_ufs_init, grub_ufs_fini): Likewise.
* fs/xfs.c (grub_xfs_init, grub_xfs_fini): Likewise.
* normal/main.c (grub_normal_init, grub_normal_fini): Likewise.
* partmap/amiga.c (grub_amiga_partition_map_init)
(grub_amiga_partition_map_fini): Likewise.
* partmap/apple.c (grub_apple_partition_map_init)
(grub_apple_partition_map_fini): Likewise.
* partmap/pc.c (grub_pc_partition_map_init)
(grub_pc_partition_map_fini): Likewise.
* partmap/sun.c (grub_sun_partition_map_init,
grub_sun_partition_map_fini): Likewise.
* term/terminfo.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* util/grub-emu.c: Include <grub_modules_init.h>.
(main): Don't initialize and de-initialize any modules directly,
use `grub_init_all' and `grub_fini_all' instead.
* term/i386/pc/vesafb.c (grub_vesafb_init): Renamed to
`grub_vesafb_mod_init'.
(grub_vesafb_fini): Renamed to `grub_vesafb_mod_fini'. Updated
all users.
* term/i386/pc/vga.c (grub_vga_init): Renamed to
`grub_vga_mod_init'. Updated all users.
(grub_vga_fini): Renamed to `grub_vga_mod_fini'.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `grub_emu_init.c'.
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c): New
rules.
* include/grub/dl.h (GRUB_MOD_INIT): Add argument `name'.
Generate a function to initialize the module in utilities.
Updated all callers.
(GRUB_MOD_FINI): Add argument `name'. Generate a function to
initialize the module in utilities. Updated all callers.
2005-11-13 15:47:09 +00:00
|
|
|
GRUB_MOD_FINI(normal)
|
2003-01-20 04:13:46 +00:00
|
|
|
{
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_set_history (0);
|
|
|
|
grub_rescue_unregister_command ("normal");
|
2003-01-20 04:13:46 +00:00
|
|
|
}
|
2005-11-13 Marco Gerards <mgerards@xs4all.nl>
* geninit.sh: New file.
* geninitheader.sh: Likewise.
* commands/boot.c (grub_boot_init, grub_boot_fini): Removed.
* commands/cat.c (grub_cat_init, grub_cat_fini): Likewise.
* commands/cmp.c (grub_cmp_init, grub_cmp_fini): Likewise.
* commands/configfile.c (grub_configfile_init)
(grub_configfile_fini): Likewise.
* commands/default.c (grub_default_init, grub_default_fini):
Likewise.
* commands/help.c (grub_help_init, grub_help_fini): Likewise.
* commands/ls.c (grub_ls_init, grub_ls_fini): Likewise.
* commands/search.c (grub_search_init, grub_search_fini): Likewise.
* commands/terminal.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* commands/test.c (grub_test_init, grub_test_fini): Likewise.
* commands/timeout.c (grub_timeout_init, grub_timeout_fini):
Likewise.
* commands/i386/pc/halt.c (grub_halt_init, grub_halt_fini): Likewise.
* commands/iee1275/halt.c (grub_halt_init, grub_halt_fini):
Likewise.
* commands/i386/pc/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* commands/iee1275/reboot.c (grub_reboot_init, grub_reboot_fini):
Likewise.
* disk/loopback.c (grub_loop_init, grub_loop_fini): Likewise.
* fs/affs.c (grub_affs_init, grub_affs_fini): Likewise.
* fs/ext2.c (grub_ext2_init, grub_ext2_fini): Likewise.
* fs/fat.c (grub_fat_init, grub_fat_fini): Likewise.
* fs/hfs.c (grub_hfs_init, grub_hfs_fini): Likewise.
* fs/iso9660.c (grub_iso9660_init, grub_iso9660_fini): Likewise.
* fs/jfs.c (grub_jfs_init, grub_jfs_fini): Likewise.
* fs/minix.c (grub_minix_init, grub_minix_fini): Likewise.
* fs/sfs.c (grub_sfs_init, grub_sfs_fini): Likewise.
* fs/ufs.c (grub_ufs_init, grub_ufs_fini): Likewise.
* fs/xfs.c (grub_xfs_init, grub_xfs_fini): Likewise.
* normal/main.c (grub_normal_init, grub_normal_fini): Likewise.
* partmap/amiga.c (grub_amiga_partition_map_init)
(grub_amiga_partition_map_fini): Likewise.
* partmap/apple.c (grub_apple_partition_map_init)
(grub_apple_partition_map_fini): Likewise.
* partmap/pc.c (grub_pc_partition_map_init)
(grub_pc_partition_map_fini): Likewise.
* partmap/sun.c (grub_sun_partition_map_init,
grub_sun_partition_map_fini): Likewise.
* term/terminfo.c (grub_terminal_init, grub_terminal_fini):
Likewise.
* util/grub-emu.c: Include <grub_modules_init.h>.
(main): Don't initialize and de-initialize any modules directly,
use `grub_init_all' and `grub_fini_all' instead.
* term/i386/pc/vesafb.c (grub_vesafb_init): Renamed to
`grub_vesafb_mod_init'.
(grub_vesafb_fini): Renamed to `grub_vesafb_mod_fini'. Updated
all users.
* term/i386/pc/vga.c (grub_vga_init): Renamed to
`grub_vga_mod_init'. Updated all users.
(grub_vga_fini): Renamed to `grub_vga_mod_fini'.
* conf/i386-pc.rmk (grub_emu_SOURCES): Add `grub_emu_init.c'.
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c): New
rules.
* include/grub/dl.h (GRUB_MOD_INIT): Add argument `name'.
Generate a function to initialize the module in utilities.
Updated all callers.
(GRUB_MOD_FINI): Add argument `name'. Generate a function to
initialize the module in utilities. Updated all callers.
2005-11-13 15:47:09 +00:00
|
|
|
|