grub/include/grub
okuji 4e93851c0f 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
..
efi 2006-04-30 Yoshinori K. Okuji <okuji@enbug.org> 2006-04-30 21:09:37 +00:00
i386 2006-04-19 Yoshinori K. Okuji <okuji@enbug.org> 2006-04-19 08:59:44 +00:00
ieee1275 2005-08-21 Vincent Pelletier <subdino2004@yahoo.fr> 2005-08-21 18:42:55 +00:00
powerpc 2006-04-23 Yoshinori K. Okuji <okuji@enbug.org> 2006-04-23 13:37:36 +00:00
sparc64 2006-04-23 Yoshinori K. Okuji <okuji@enbug.org> 2006-04-23 13:37:36 +00:00
util 2005-02-15 Yoshinori K. Okuji <okuji@enbug.org> 2005-02-15 00:07:01 +00:00
acorn_filecore.h 2005-11-13 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk> 2005-11-13 19:45:12 +00:00
arg.h 2005-07-17 Yoshinori Okuji <okuji@enbug.org> 2005-07-17 20:26:07 +00:00
boot.h 2004-04-04 Yoshinori K. Okuji <okuji@enbug.org> 2004-04-04 13:46:03 +00:00
cache.h 2004-12-27 Marco Gerards <metgerards@student.han.nl> 2004-12-27 13:46:20 +00:00
device.h 2005-08-20 Yoshinori K. Okuji <okuji@enbug.org> 2005-08-20 07:49:02 +00:00
disk.h 2006-04-23 Yoshinori K. Okuji <okuji@enbug.org> 2006-04-23 13:37:36 +00:00
dl.h 2005-11-27 Marco Gerards <mgerards@xs4all.nl> 2005-11-27 12:21:12 +00:00
elf.h 2004-04-04 Yoshinori K. Okuji <okuji@enbug.org> 2004-04-04 13:46:03 +00:00
env.h 2006-05-02 Yoshinori K. Okuji <okuji@enbug.org> 2006-05-01 23:30:51 +00:00
err.h 2005-12-24 Vesa Jaaskelainen <chaac@nic.fi> 2005-12-23 22:59:12 +00:00
file.h 2004-04-04 Yoshinori K. Okuji <okuji@enbug.org> 2004-04-04 13:46:03 +00:00
font.h 2006-03-14 Vesa Jaaskelainen <chaac@nic.fi> 2006-03-14 19:08:34 +00:00
fs.h 2005-10-09 Marco Gerards <mgerards@xs4all.nl> 2005-10-09 13:03:53 +00:00
fshelp.h 2005-12-25 Marco Gerards <marco@gnu.org> 2005-12-25 15:59:50 +00:00
gzio.h 2005-08-22 Yoshinori K. Okuji <okuji@enbug.org> 2005-08-22 17:28:59 +00:00
hfs.h 2006-01-03 Hollis Blanchard <hollis@penguinppc.org> 2006-01-03 14:30:57 +00:00
kernel.h 2006-04-25 Yoshinori K. Okuji <okuji@enbug.org> 2006-04-25 20:08:31 +00:00
loader.h 2006-04-30 Yoshinori K. Okuji <okuji@enbug.org> 2006-04-30 21:09:37 +00:00
misc.h 2006-04-23 Yoshinori K. Okuji <okuji@enbug.org> 2006-04-23 13:37:36 +00:00
mm.h 2006-04-25 Yoshinori K. Okuji <okuji@enbug.org> 2006-04-25 20:08:31 +00:00
net.h 2004-04-04 Yoshinori K. Okuji <okuji@enbug.org> 2004-04-04 13:46:03 +00:00
normal.h 2006-05-07 Yoshinori K. Okuji <okuji@enbug.org> 2006-05-07 18:28:24 +00:00
parser.h 2005-10-24 Marco Gerards <mgerards@xs4all.nl> 2005-10-24 10:23:46 +00:00
partition.h 2005-08-20 Yoshinori K. Okuji <okuji@enbug.org> 2005-08-20 07:49:02 +00:00
pc_partition.h 2005-12-03 Marco Gerards <mgerards@xs4all.nl> 2005-12-03 17:54:55 +00:00
rescue.h 2004-04-04 Yoshinori K. Okuji <okuji@enbug.org> 2004-04-04 13:46:03 +00:00
script.h 2006-17-04 Marco Gerards <marco@gnu.org> 2006-04-17 13:01:20 +00:00
setjmp.h 2004-11-17 Hollis Blanchard <hollis@penguinppc.org> 2004-11-16 23:34:45 +00:00
symbol.h 2006-04-26 Yoshinori K. Okuji <okuji@enbug.org> 2006-04-26 21:58:36 +00:00
term.h 2005-10-15 Yoshinori K. Okuji <okuji@enbug.org> 2005-10-15 09:22:32 +00:00
terminfo.h 2005-09-03 Yoshinori K. Okuji <okuji@enbug.org> 2005-09-03 16:54:27 +00:00
tparm.h 2005-09-03 Yoshinori K. Okuji <okuji@enbug.org> 2005-09-03 16:54:27 +00:00
types.h 2005-11-13 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk> 2005-11-13 19:45:12 +00:00
video.h 2006-04-26 Yoshinori K. Okuji <okuji@enbug.org> 2006-04-26 21:58:36 +00:00