From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 23 Dec 2009 23:38:41 +0000 (+0100)
Subject: merge crypto into multiout
X-Git-Tag: 1.98~202^2~42
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e48625a3066e5ad1c04d74cc5f3ce5c10c632496;p=thirdparty%2Fgrub.git

merge crypto into multiout
---

e48625a3066e5ad1c04d74cc5f3ce5c10c632496
diff --cc conf/any-emu.rmk
index 2c383f387,a3b3c84d9..bbc564c80
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@@ -24,10 -24,10 +24,10 @@@ grub_emu_SOURCES = commands/minicmd.c c
  	kern/partition.c kern/reader.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/term.c				\
 -	normal/menu_text.c normal/crypto.c				\
++	normal/menu_text.c normal/crypto.c normal/term.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 02d57f0a3,271384d53..83168557d
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@@ -543,7 -543,7 +543,7 @@@ normal_mod_SOURCES = normal/main.c norm
  	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/term.c
 -	normal/misc.c normal/crypto.c
++	normal/misc.c normal/crypto.c normal/term.c
  normal_mod_CFLAGS = $(COMMON_CFLAGS)
  normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
  
diff --cc include/grub/normal.h
index d629338e6,66b427bcb..33c30b22a
--- a/include/grub/normal.h
+++ b/include/grub/normal.h
@@@ -95,7 -95,8 +95,9 @@@ void read_command_list (void)
  /* Defined in `autofs.c'.  */
  void read_fs_list (void);
  
+ void read_crypto_list (void);
+ 
 +void grub_set_more (int onoff);
  
  #ifdef GRUB_UTIL
  void grub_normal_init (void);