From a009dceedaedb930dc3458202274d534baeabaf4 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Fri, 26 Sep 2008 16:45:29 -0700
Subject: [PATCH] Update gPXE to version 0.9.4

Update gPXE to release version 0.9.4.

gpxe-for-syslinux	6ef0d500df9e7c827352aca76a5e1966a5f29bfa
gpxe upstream		601d244a8e6dc742780060a9e0c48b91fa6c4524
			(gpxe-0.9.4-release)

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
 gpxe/VERSION                          | 2 +-
 gpxe/src/Makefile.housekeeping        | 4 ++--
 gpxe/src/arch/i386/prefix/romprefix.S | 2 +-
 gpxe/src/core/settings.c              | 2 ++
 gpxe/src/include/gpxe/settings.h      | 1 +
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gpxe/VERSION b/gpxe/VERSION
index e466de0c..02f4fc9b 100644
--- a/gpxe/VERSION
+++ b/gpxe/VERSION
@@ -1 +1 @@
-0.9.3 2008-02-14
+0.9.4 2008-09-26
diff --git a/gpxe/src/Makefile.housekeeping b/gpxe/src/Makefile.housekeeping
index bbbfc899..17df25f1 100644
--- a/gpxe/src/Makefile.housekeeping
+++ b/gpxe/src/Makefile.housekeeping
@@ -11,8 +11,8 @@ CLEANUP	:= $(BIN)/*.* # *.* to avoid catching the "CVS" directory
 #
 VERSION_MAJOR	= 0
 VERSION_MINOR	= 9
-VERSION_PATCH	= 3
-EXTRAVERSION	= +
+VERSION_PATCH	= 4
+EXTRAVERSION	=
 MM_VERSION	= $(VERSION_MAJOR).$(VERSION_MINOR)
 VERSION		= $(MM_VERSION).$(VERSION_PATCH)$(EXTRAVERSION)
 CFLAGS		+= -DVERSION_MAJOR=$(VERSION_MAJOR) \
diff --git a/gpxe/src/arch/i386/prefix/romprefix.S b/gpxe/src/arch/i386/prefix/romprefix.S
index 872fbf56..92a931cd 100644
--- a/gpxe/src/arch/i386/prefix/romprefix.S
+++ b/gpxe/src/arch/i386/prefix/romprefix.S
@@ -375,7 +375,7 @@ init_message_prompt:
 	.asciz	"\nPress Ctrl-B to configure gPXE..."
 	.size	init_message_prompt, . - init_message_prompt
 clear_message:
-	.asciz	"\r                                     \n\n"
+	.asciz	"\r                                          \n\n"
 	.size	clear_message, . - clear_message
 
 /* ROM image location
diff --git a/gpxe/src/core/settings.c b/gpxe/src/core/settings.c
index a1299ee2..3e9eb18a 100644
--- a/gpxe/src/core/settings.c
+++ b/gpxe/src/core/settings.c
@@ -1040,6 +1040,8 @@ static int fetchf_hex ( struct settings *settings, struct setting *setting,
 
 		check_len = fetch_setting ( settings, setting, raw,
 					    sizeof ( raw ) );
+		if ( check_len < 0 )
+			return check_len;
 		assert ( check_len == raw_len );
 		
 		if ( len )
diff --git a/gpxe/src/include/gpxe/settings.h b/gpxe/src/include/gpxe/settings.h
index 78f3e698..ee7dacee 100644
--- a/gpxe/src/include/gpxe/settings.h
+++ b/gpxe/src/include/gpxe/settings.h
@@ -216,6 +216,7 @@ extern struct setting priority_setting __setting;
 extern struct setting bios_drive_setting __setting;
 extern struct setting uuid_setting __setting;
 extern struct setting next_server_setting __setting;
+extern struct setting mac_setting __setting;
 
 /**
  * Initialise a settings block
-- 
2.11.4.GIT