From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 20:31:39 +0000 (+0100)
Subject: merge mainline into newenv
X-Git-Tag: 1.98~138^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61c501a94151d1830743200efc87f21e69cbbfc9;p=thirdparty%2Fgrub.git

merge mainline into newenv
---

61c501a94151d1830743200efc87f21e69cbbfc9
diff --cc conf/any-emu.rmk
index 066bb52ba,5aa923893..1277af791
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@@ -21,13 -23,14 +23,14 @@@ grub_emu_SOURCES = commands/minicmd.c c
  	kern/err.c kern/list.c kern/handler.c				\
  	kern/command.c kern/corecmd.c commands/extcmd.c	kern/file.c	\
  	kern/fs.c commands/boot.c kern/main.c kern/misc.c kern/parser.c	\
- 	kern/partition.c kern/reader.c kern/term.c			\
+ 	kern/partition.c kern/term.c					\
  	kern/rescue_reader.c kern/rescue_parser.c			\
  	lib/arg.c normal/cmdline.c normal/datetime.c normal/misc.c	\
- 	normal/handler.c normal/auth.c normal/autofs.c			\
+ 	normal/handler.c normal/auth.c lib/crypto.c normal/autofs.c	\
  	normal/completion.c normal/main.c normal/color.c		\
- 	normal/menu.c normal/menu_entry.c normal/menu_viewer.c		\
- 	normal/menu_text.c normal/context.c				\
+ 	normal/menu.c normal/menu_entry.c		\
+ 	normal/menu_text.c normal/crypto.c normal/term.c		\
 -	commands/terminal.c lib/charset.c \
++	commands/terminal.c normal/context.c lib/charset.c \
  	script/main.c script/execute.c script/function.c		\
  	script/lexer.c script/script.c grub_script.tab.c		\
  	partmap/amiga.c	partmap/apple.c partmap/msdos.c partmap/sun.c	\
diff --cc conf/common.rmk
index 74e2b5bc4,4e5ed9c73..2ea8ebd5a
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@@ -542,8 -587,8 +587,8 @@@ keystatus_mod_LDFLAGS = $(COMMON_LDFLAG
  normal_mod_SOURCES = normal/main.c normal/cmdline.c normal/dyncmd.c \
  	normal/auth.c normal/autofs.c normal/handler.c \
  	normal/color.c normal/completion.c normal/datetime.c normal/menu.c \
- 	normal/menu_entry.c normal/menu_text.c normal/menu_viewer.c \
- 	normal/misc.c normal/context.c
+ 	normal/menu_entry.c normal/menu_text.c \
 -	normal/misc.c normal/crypto.c normal/term.c
++	normal/misc.c normal/crypto.c normal/term.c normal/context.c
  normal_mod_CFLAGS = $(COMMON_CFLAGS)
  normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
  
diff --cc include/grub/normal.h
index 0cdc653e6,58b2c7966..e804fde77
--- a/include/grub/normal.h
+++ b/include/grub/normal.h
@@@ -95,9 -101,12 +101,15 @@@ void read_command_list (void)
  /* Defined in `autofs.c'.  */
  void read_fs_list (void);
  
 +void grub_context_init (void);
 +void grub_context_fini (void);
 +
+ void read_crypto_list (void);
+ 
+ void read_terminal_list (void);
+ 
+ void grub_set_more (int onoff);
+ 
  #ifdef GRUB_UTIL
  void grub_normal_init (void);
  void grub_normal_fini (void);
diff --cc kern/corecmd.c
index 7e8a3b4f6,3e508cd2c..8b8df63cb
--- a/kern/corecmd.c
+++ b/kern/corecmd.c
@@@ -178,11 -190,13 +178,11 @@@ voi
  grub_register_core_commands (void)
  {
    grub_register_command ("set", grub_core_cmd_set,
- 			 "set [ENVVAR=VALUE]", "set an environment variable");
+ 			 "[ENVVAR=VALUE]", "Set an environment variable.");
    grub_register_command ("unset", grub_core_cmd_unset,
- 			 "unset ENVVAR", "remove an environment variable");
+ 			 "ENVVAR", "Remove an environment variable.");
 -  grub_register_command ("export", grub_core_cmd_export,
 -			 "ENVVAR", "Export a variable.");
    grub_register_command ("ls", grub_core_cmd_ls,
- 			 "ls [ARG]", "list devices or files");
+ 			 "[ARG]", "List devices or files.");
    grub_register_command ("insmod", grub_core_cmd_insmod,
- 			 "insmod MODULE", "insert a module");
+ 			 "MODULE", "Insert a module.");
  }
diff --cc normal/main.c
index 53cd9040b,6e3518a59..9f8c12773
--- a/normal/main.c
+++ b/normal/main.c
@@@ -613,10 -667,7 +669,9 @@@ GRUB_MOD_INIT(normal
  
  GRUB_MOD_FINI(normal)
  {
 +  grub_context_fini ();
 +
    grub_set_history (0);
-   grub_reader_unregister (&grub_normal_reader);
    grub_register_variable_hook ("pager", 0, 0);
    grub_fs_autoload_hook = 0;
    free_handler_list ();