grub2 ./ChangeLog ./DISTLIST conf/common.mk con...

[Yoshinori K. Okuji]

CVSROOT:        /cvsroot/grub
Module name:    grub2
Branch:         
Changes by:     Yoshinori K. Okuji <address@hidden>     06/05/07 18:28:24

Modified files:
        .              : ChangeLog DISTLIST 
        conf           : common.mk common.rmk i386-efi.mk i386-efi.rmk 
                         i386-pc.mk i386-pc.rmk powerpc-ieee1275.mk 
                         powerpc-ieee1275.rmk sparc64-ieee1275.mk 
                         sparc64-ieee1275.rmk 
        include/grub   : normal.h 
        normal         : main.c menu.c 
Removed files:
        commands       : default.c timeout.c 
        normal         : context.c 

Log message:
        2006-05-07  Yoshinori K. Okuji  <address@hidden>
        
        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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/grub/grub2/ChangeLog.diff?tr1=1.257&tr2=1.258&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/grub/grub2/DISTLIST.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/grub/grub2/conf/common.mk.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/grub/grub2/conf/common.rmk.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/grub/grub2/conf/i386-efi.mk.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/grub/grub2/conf/i386-efi.rmk.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/grub/grub2/conf/i386-pc.mk.diff?tr1=1.66&tr2=1.67&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/grub/grub2/conf/i386-pc.rmk.diff?tr1=1.62&tr2=1.63&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/grub/grub2/conf/powerpc-ieee1275.mk.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/grub/grub2/conf/powerpc-ieee1275.rmk.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/grub/grub2/conf/sparc64-ieee1275.mk.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/grub/grub2/conf/sparc64-ieee1275.rmk.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/grub/grub2/include/grub/normal.h.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/grub/grub2/normal/main.c.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/grub/grub2/normal/menu.c.diff?tr1=1.15&tr2=1.16&r1=text&r2=text