[Linux-ia64] [PATCH] fix elilo invocations from the boot manager

[Linux-ia64] [PATCH] fix elilo invocations from the boot manager

[Bill Nottingham]

[-- Attachment #1: Type: text/plain, Size: 225 bytes --]

In some odd cases, when the boot manager invokes elilo, argc is 0,
while Optind is initialized to 1. If we continue with prompting
disabled, strange things can happen. (usually, attempts to boot
a non-existant kernel.)

Bill

[-- Attachment #2: elilo-2.5-prompt.patch --]
[-- Type: text/plain, Size: 394 bytes --]

diff -ru gnu-efi-2.5/elilo/elilo.c ook/elilo/elilo.c
--- elilo/elilo.c	Mon May 21 17:58:56 2001
+++ elilo/elilo.c	Tue Jun  5 14:02:04 2001
@@ -373,7 +381,7 @@
 	 * if user specified a kernel name or label, then ignore
 	 * forced interactive mode
 	 */
-	if (argv[Optind]) elilo_opt.prompt = 0;
+	if (argv[Optind] && Optind <= argc) elilo_opt.prompt = 0;
 
 	/*
 	 * which chooser we will use 

Re: [Linux-ia64] [PATCH] fix elilo invocations from the boot manager

[Stephane Eranian]

Bill,

On Tue, Jun 05, 2001 at 02:24:11PM -0400, Bill Nottingham wrote:
> In some odd cases, when the boot manager invokes elilo, argc is 0,
> while Optind is initialized to 1. If we continue with prompting
> disabled, strange things can happen. (usually, attempts to boot
> a non-existant kernel.)
> 
Thanks for your patch. This comes from the fact that the parameters
passed by the caller are in a weird state and confuse the function
that converts them into argc/argv form. I have noticed the same thing
when booting from the network and that's why I introduce the fixupargs()
stage in the main routine.

-- 
-Stephane