grub ./ChangeLog stage2/stage2.c

[OKUJI Yoshinori]

CVSROOT:        /cvsroot/grub
Module name:    grub
Changes by:     OKUJI Yoshinori <address@hidden>        02/01/05 14:59:29

Modified files:
        .              : ChangeLog 
        stage2         : stage2.c 

Log message:
        2002-01-06  Yoshinori K. Okuji  <address@hidden>
        
        The preset menu has a priority over the configuration file.
        Suggested by Christoph Plattner.
        
        * stage2/stage2.c [PRESET_MENU_STRING] (open_preset_menu):
        Check if PRESET_MENU is not NULL.
        [PRESET_MENU_STRING] (close_preset_menu): Set PRESET_MENU to
        NULL.
        (cmain): New internal function, reset. This function resets
        AUTO_FILL, CONFIG_LEN, MENU_LEN, NUM_ENTRIES, CONFIG_ENTRIES,
        MENU_ENTRIES and call init_config.
        Try to open the preset menu first, and try to open the
        configuration file, only if that failed.
        Even if the preset menu was read, try to open the configuration
        file. This time, opening the preset menu never succeed, because
        close_preset_menu ensures that the preset menu is available at
        most once.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grub/grub/ChangeLog.diff?tr1=1.457&tr2=1.458&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grub/grub/stage2/stage2.c.diff?tr1=1.32&tr2=1.33&r1=text&r2=text