elilo-3.3a netbooting patch

Linux-ia64 Stephane Eranian 1 participant 1 message Jan 21, 2003

Share & tools

Stephane Eranian

author

2003-01-21 18:58 UTC #0 lore raw

Hi,

The following patch fixes a problem when netbooting with elilo. Some IP addresses were not correctly converted to strings. This problem affects people who are netbooting AND passing the DHCP-obtained IP address to the kernel using elilo's %I, %M, %N substitution variables. Other netbooting configurations should not be affected by this bug. The patch also includes 2 other minor bug fixes.

The patch is to be applied to elilo-3.3a.

Signature · 1 line

-Stephane

ChangeLog +5 -0

diff -urN elilo-3.3a/ChangeLog elilo-3.3b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-21 Stephane Eranian <[email protected]>
+	* fix bug in glue_netfs.c convert_ip2decstr() which caused some IP
+	  addresses to be incorrectly converted to strings.
+2002-11-01 Stephane Eranian <[email protected]>
+	* fix bug in -r option for IA64. There is no argument to this option.
 2002-10-15 Stephane Eranian <[email protected]>
 	* fixed a double free bug for the kernel memory in case of abort.
 	  (bug spotted by Levent Akyl from Intel)

glue_netfs.c +2 -1

diff -urN elilo-3.3a/glue_netfs.c elilo-3.3b/glue_netfs.c
@@ -82,9 +82,10 @@
 		}
 		val = val % 100;
 		v = val / 10;
-		if (v) {
+		if (v || ip[i] >= 100) {
 			str[j++] = '0'+v;
 		}
+
 		v = val % 10;
 		str[j++] = '0'+v;
 		if (i < l-1) str[j++] = '.';

ia32/system.c +11 -0

diff -urN elilo-3.3a/ia32/system.c elilo-3.3b/ia32/system.c
@@ -843,6 +843,17 @@
 		return -1;
 	}
 
+	/* 
+	 * Let's not forget efi info for EFI aware
+	 * IA32 kernels...
+	 */
+	bp->s.efi_sys_tbl = (UINTN)systab;
+	bp->s.efi_mem_map 	= (UINTN)mdesc.md;
+	bp->s.efi_mem_map_size	= mdesc.map_size;
+	bp->s.efi_mem_desc_size = mdesc.desc_size;
+	bp->s.efi_mem_desc_ver 	= mdesc.desc_version;
+	
+
 	*cookie = mdesc.cookie;
 
 	return 0;

ia64/config.c +1 -1

diff -urN elilo-3.3a/ia64/config.c elilo-3.3b/ia64/config.c
@@ -96,7 +96,7 @@
 	    || (elilo_opt.sys_img_opts && elilo_opt.sys_img_opts->allow_relocation ==TRUE) ? 1 : 0;
 }
 
-#define IA64_CMDLINE_OPTIONS	L"r:F:"
+#define IA64_CMDLINE_OPTIONS	L"rF:"
 
 CHAR16 *
 sysdeps_get_cmdline_opts(VOID)