Stephane Eranian 2009-10-26 09:42:58 -04:00 committed by Vincent Batts
parent 4e87874a03
commit e351d8fbea
26 changed files with 511 additions and 113 deletions

View file

@ -32,6 +32,7 @@
#include "elilo.h"
#include "vars.h"
#include "console.h"
/* static is ugly but does the job here! */
static CHAR16 **alt_argv;
@ -288,6 +289,7 @@ restart:
}
if (elilo_opt.prompt) {
console_textmode();
ret = select_kernel(buffer, sizeof(buffer));
if (ret == -1) return -1;
argc = argify(buffer,sizeof(buffer), argv);
@ -355,7 +357,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;

View file

@ -31,6 +31,7 @@
#include <efilib.h>
#include "elilo.h"
#include "console.h"
#define MAX_LABELS 64
#define MSGBUFLEN 4096
@ -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;