From: Robert Millan <rmh@aybabtu.com>
Date: Thu, 7 Jan 2010 00:58:54 +0000 (+0000)
Subject: Merge from trunk
X-Git-Tag: 1.98~202^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1d2f1d81b0b379c840eee3de8988f0e105dc0a0;p=thirdparty%2Fgrub.git

Merge from trunk
---

c1d2f1d81b0b379c840eee3de8988f0e105dc0a0
diff --cc commands/xnu_uuid.c
index b01352269,b6f2b2604..ecf8ba00a
--- a/commands/xnu_uuid.c
+++ b/commands/xnu_uuid.c
@@@ -31,8 -31,8 +31,9 @@@
  #include <grub/misc.h>
  #include <grub/env.h>
  #include <grub/command.h>
+ #include <grub/i18n.h>
  #include <grub/crypto.h>
 +#include <grub/i18n.h>
  
  /* This prefix is used by xnu and boot-132 to hash
     together with volume serial. */
diff --cc normal/main.c
index cdb816bfc,b50e17025..0d7041612
--- a/normal/main.c
+++ b/normal/main.c
@@@ -433,6 -416,19 +433,20 @@@ grub_normal_init_page (struct grub_term
    grub_free (unicode_msg);
  }
  
+ static int reader_nested;
+ 
+ static char *
+ read_lists (struct grub_env_var *var __attribute__ ((unused)),
+ 	    const char *val)
+ {
+   read_command_list ();
+   read_fs_list ();
+   read_handler_list ();
+   read_crypto_list ();
++  read_terminal_list ();
+   return val ? grub_strdup (val) : NULL;
+ }
+ 
  /* Read the config file CONFIG and execute the menu interface or
     the command line interface if BATCH is false.  */
  void
@@@ -440,13 -436,12 +454,10 @@@ grub_normal_execute (const char *config
  {
    grub_menu_t menu = 0;
  
-   read_command_list ();
-   read_fs_list ();
-   read_handler_list ();
-   read_crypto_list ();
-   read_terminal_list ();
+   read_lists (NULL, NULL);
+   grub_register_variable_hook ("prefix", NULL, read_lists);
    grub_command_execute ("parser.grub", 0, 0);
  
 -  reader_nested = nested;
 -
    if (config)
      {
        menu = read_config_file (config);