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

2005-02-27 Yoshinori K. Okuji <okuji@enbug.org>

Browse source 
* commands/default.h: New file.
  * commands/timeout.h: Likewise.
  * normal/context.c: Likewise.

  * util/misc.c: Do not include sys/times.h.
  Include sys/time.h and grub/machine/time.h.
  (grub_get_rtc): Rewritten with gettimeofday.

  * util/grub-emu.c (main): Call grub_default_init and
  grub_timeout_init before grub_normal_init, and call
  grub_timeout_fini and grub_default_fini after grub_main.

  * util/console.c (grub_ncurses_checkkey): Return the read
  character or -1.

  * normal/menu.c (run_menu): Set MENU->TIMEOUT to -1 once it
  timeouts.

  * normal/main.c (read_config_file): Push MENU. If this fails,
  print an error and wait for a user input.
  Print an error only if GRUB_ERRNO is not GRUB_ERR_NONE.
  If a menu is empty or an error occurs, pop MENU.
  (grub_normal_execute): Pop and free MENU after grub_menu_run
  returns.

  * kern/loader.c (grub_loader_boot): Call grub_machine_fini.

  * include/grub/powerpc/ieee1275/time.h [GRUB_UTIL]: Do not
  include time.h.
  [GRUB_UTIL] (GRUB_TICKS_PER_SECOND): Use the same definition as
  without GRUB_UTIL.
  * include/grub/i386/pc/time.h [GRUB_UTIL]: Do not include
  time.h.
  [GRUB_UTIL] (GRUB_TICKS_PER_SECOND): Use the same definition as
  without GRUB_UTIL.

  * include/grub/normal.h (struct grub_menu_list): New struct.
  (grub_menu_list_t): New type.
  (struct grub_context): New struct.
  (grub_context_t): New type.
  (grub_register_command): Got rid of EXPORT_FUNC.
  (grub_unregister_command): Likewise.
  (grub_context_get): New prototype.
  (grub_context_get_current_menu): Likewise.
  (grub_context_push_menu): Likewise.
  (grub_context_pop_menu): Likewise.
  [GRUB_UTIL] (grub_default_init): Likewise.
  [GRUB_UTIL] (grub_default_fini): Likewise.
  [GRUB_UTIL] (grub_timeout_init): Likewise.
  [GRUB_UTIL] (grub_timeout_fini): Likewise.

  * conf/i386-pc.rmk (grub_emu_SOURCES): Added commands/default.c,
  commands/timeout.c and normal/context.c.
  (pkgdata_MODULES): Added default.mod and timeout.mod.
  (normal_mod_SOURCES): Added normal/context.c.
  (default_mod_SOURCES): New variable.
  (default_mod_CFLAGS): Likewise.
  (timeout_mod_SOURCES): Likewise.
  (timeout_mod_CFLAGS): Likewise.
  * conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Copied from
  conf/i386-pc.rmk.
  (pkgdata_MODULES): Added default.mod and timeout.mod.
  (normal_mod_SOURCES): Added normal/context.c.
  (default_mod_SOURCES): New variable.
  (default_mod_CFLAGS): Likewise.
  (timeout_mod_SOURCES): Likewise.
  (timeout_mod_CFLAGS): Likewise.

  * Makefile.in (all-local): Added $(MKFILES).
This commit is contained in:
okuji 2005-02-27 21:19:06 +00:00
parent 4ed2e1dd1c
commit 93f3a1d868
18 changed files with 895 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

72
commands/default.c Normal file
View file

@ -0,0 +1,72 @@
/* default.c - set the default boot entry */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2005 Free Software Foundation, Inc.
*
* GRUB 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 GRUB; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <grub/arg.h>
#include <grub/misc.h>
#include <grub/normal.h>
#include <grub/err.h>
#include <grub/dl.h>
/* This is a simple version. This should support a saved boot entry,
a label, etc. */
static grub_err_t
grub_cmd_default (struct grub_arg_list *state __attribute__ ((unused)),
int argc, char **args)
{
grub_menu_t menu;
if (argc != 1)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "entry number required");
menu = grub_context_get_current_menu ();
if (menu)
menu->default_entry = grub_strtoul (args[0], 0, 0);
return grub_errno;
}
#ifdef GRUB_UTIL
void
grub_default_init (void)
{
grub_register_command ("default", grub_cmd_default, GRUB_COMMAND_FLAG_MENU,
"default ENTRY", "Set the default entry", 0);
}
void
grub_default_fini (void)
{
grub_unregister_command ("default");
}
#else /* ! GRUB_UTIL */
GRUB_MOD_INIT
{
(void)mod; /* To stop warning. */
grub_register_command ("default", grub_cmd_default, GRUB_COMMAND_FLAG_MENU,
"default ENTRY", "Set the default entry", 0);
}
GRUB_MOD_FINI
{
grub_unregister_command ("default");
}
#endif /* ! GRUB_UTIL */

70
commands/timeout.c Normal file
View file

@ -0,0 +1,70 @@
/* timeout.c - set the timeout */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2005 Free Software Foundation, Inc.
*
* GRUB 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 GRUB; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <grub/arg.h>
#include <grub/misc.h>
#include <grub/normal.h>
#include <grub/err.h>
#include <grub/dl.h>
static grub_err_t
grub_cmd_timeout (struct grub_arg_list *state __attribute__ ((unused)),
int argc, char **args)
{
grub_menu_t menu;
if (argc != 1)
return grub_error (GRUB_ERR_BAD_ARGUMENT, "timeout value required");
menu = grub_context_get_current_menu ();
if (menu)
menu->timeout = grub_strtoul (args[0], 0, 0);
return grub_errno;
}
#ifdef GRUB_UTIL
void
grub_timeout_init (void)
{
grub_register_command ("timeout", grub_cmd_timeout, GRUB_COMMAND_FLAG_MENU,
"timeout SECS", "Set the timeout", 0);
}
void
grub_timeout_fini (void)
{
grub_unregister_command ("timeout");
}
#else /* ! GRUB_UTIL */
GRUB_MOD_INIT
{
(void)mod; /* To stop warning. */
grub_register_command ("timeout", grub_cmd_timeout, GRUB_COMMAND_FLAG_MENU,
"timeout SECS", "Set the timeout", 0);
}
GRUB_MOD_FINI
{
grub_unregister_command ("timeout");
}
#endif /* ! GRUB_UTIL */