Re: [Linux-ia64] New gnu-efi package and new boot loader available

[Andreas Schwab <schwab@suse.de>]

Stephane Eranian <eranian@frankl.hpl.hp.com> writes:

|> Hi,
|> 
|> I have uploaded to the HPLabs FTP site a new version of the gnu-efi 
|> package.  It is available at:
|> 	
|> 	ftp://ftp.hpl.hp.com/pub/linux-ia64/gnu-efi-2.0.tar.gz

Another patch to improve the usefullness of the config file:

--- elilo/config.c
+++ elilo/config.c	2001/04/06 15:02:19
@@ -46,6 +46,7 @@
 } boot_image_t;
 
 boot_image_t *image_head, *default_image;
+static CHAR16 *root;
 
 /*
  * XXX: needs to be cleaned up seriously
@@ -167,12 +168,12 @@
 		} else if (strncmpa(p1, "vga", 3) = 0) {
 			/* FIXME: I think we can actually do this */
 		} else if (strncmpa(p1, "timeout", 7) = 0) {
-			//timeout = Atoi(aToU(p2));
+			elilo_opt.timeout = Atoi(aToU(p2));
 		} else if (strncmpa(p1, "root", 4) = 0) {
 			if (image)
 				image->root = StrDuplicate(aToU(p2));
-			//else
-				//root = StrDuplicate(aToU(p2));
+			else
+				root = StrDuplicate(aToU(p2));
 		} else if (strncmpa(p1, "initrd",6) = 0) {
 			if (image)
 				image->initrd = StrDuplicate(aToU(p2));
@@ -271,16 +272,16 @@
 
 	options[0] = 0;
 
-	if (img->root) {
+	if (img->root || root) {
 		StrCat(options, W2U(L"root="));
-		StrCat(options, img->root);
+		StrCat(options, img->root ? img->root : root);
 	}
 	/* XXX: check max length */
 	if (img->options) {
 		StrCat(options, W2U(L" "));
 		StrCat(options, img->options);
 	}
-	if (img->readonly) {
+	if (img->readonly != -1 ? img->readonly : elilo_opt.readonly) {
 		StrCat(options, W2U(L" ro"));
 	}
 	if (img->initrd) StrCpy(initrd, img->initrd);

Andreas.

-- 
Andreas Schwab                                  "And now for something
SuSE Labs                                        completely different."
Andreas.Schwab@suse.de
SuSE GmbH, Schanzäckerstr. 10, D-90443 Nürnberg
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5