2009-03-22 Yoshinori K. Okuji <okuji@enbug.org>

* normal/main.c (grub_normal_execute): Added an argument
    BATCH to specify if an interactive interface should be provided
    after reading a config file.
    All callers updated.
    (read_command_list): Prevent being executed twice.
    (read_fs_list): Likewise.

    * include/grub/normal.h (grub_normal_execute):
This commit is contained in:
okuji 2009-03-22 10:05:31 +00:00
parent fbc00b0ca1
commit f04f02e496
4 changed files with 47 additions and 19 deletions

View file

@ -1,7 +1,7 @@
/* configfile.c - command to manually load config file */
/*
* GRUB -- GRand Unified Bootloader
* Copyright (C) 2005,2006,2007 Free Software Foundation, Inc.
* Copyright (C) 2005,2006,2007,2009 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
@ -39,7 +39,7 @@ grub_cmd_source (grub_command_t cmd, int argc, char **args)
grub_env_context_open ();
}
grub_normal_execute (args[0], 1);
grub_normal_execute (args[0], 1, ! new_env);
if (new_env)
grub_env_context_close ();