don't double patch!

[debian/elilo] / choosers / textmenu.c

diff --git a/choosers/textmenu.c b/choosers/textmenu.c
index 400d4f6489013df9abbcd2d619b73e7376aa2aba..52021a91bb7296b9614f978b202dfcad4d562142 100644 (file)
--- a/choosers/textmenu.c
+++ b/choosers/textmenu.c
@@ -31,6 +31,7 @@
 #include <efilib.h>
 
 #include "elilo.h"
+#include "console.h"
 
 #define MAX_LABELS     64
 #define MSGBUFLEN      4096
@@ -186,12 +187,12 @@ paint_menu(VOID)
 }
 
 static INTN
-read_message_file(INTN msg, INT8 *buf, INTN max)
+read_message_file(INTN msg, UINT8 *buf, UINTN max)
 {
        CHAR16 *filename;
        fops_fd_t message_fd;
        EFI_STATUS status;
-       INTN len = max;
+       UINTN len = max;
 
        if (msg > 10) return 0;
 
@@ -362,10 +363,10 @@ textmenu_choose(CHAR16 **argv, INTN argc, INTN index, CHAR16 *kname, CHAR16 *cmd
 {      
 #      define BOOT_IMG_STR     L"BOOT_IMAGE="
        CHAR16 label[CMDLINE_MAXLEN];
-       CHAR16 initrd_name[CMDLINE_MAXLEN];
-       CHAR16 vmcode_name[CMDLINE_MAXLEN];
+       CHAR16 initrd_name[PATHNAME_MAXLEN];
+       CHAR16 vmcode_name[PATHNAME_MAXLEN];
        CHAR16 args[CMDLINE_MAXLEN];
-       CHAR16 devname[CMDLINE_MAXLEN];
+       CHAR16 devname[PATHNAME_MAXLEN];
        CHAR16 dpath[FILENAME_MAXLEN];
        CHAR16 *slash_pos, *colon_pos, *backslash_pos;
        UINTN len;
@@ -394,6 +395,7 @@ restart:
        Memset(&elilo_opt.img_opt, 0, sizeof(elilo_opt.img_opt));
 
        if (elilo_opt.prompt) {
+               console_textmode();
                ret = select_kernel(label, sizeof(label));
                if (ret == -1) return -1;
                argc    = argify(PromptBuf,sizeof(PromptBuf), argv); 
@@ -466,7 +468,7 @@ restart:
 
        if (elilo_opt.prompt == 0) {
                /* minimal printing */
-               Print(L"ELILO\n");
+               Print(L"ELILO v%s for EFI/%a\n", ELILO_VERSION, ELILO_ARCH);
                ret = wait_timeout(elilo_opt.delay);
                if (ret != 0) {
                        elilo_opt.prompt = 1;