aboutsummaryrefslogtreecommitdiffstats
path: root/gpxe/src
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-09-26 16:45:29 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-09-26 16:45:29 -0700
commita009dceedaedb930dc3458202274d534baeabaf4 (patch)
tree5643d795e0b469c0cfb7662d7faca5a49fabf6d5 /gpxe/src
parent1e67bf2647c39f057809567e6ae512d6c92fd516 (diff)
downloadsyslinux.git-a009dceedaedb930dc3458202274d534baeabaf4.tar.gz
syslinux.git-a009dceedaedb930dc3458202274d534baeabaf4.tar.xz
syslinux.git-a009dceedaedb930dc3458202274d534baeabaf4.zip
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>
Diffstat (limited to 'gpxe/src')
-rw-r--r--gpxe/src/Makefile.housekeeping4
-rw-r--r--gpxe/src/arch/i386/prefix/romprefix.S2
-rw-r--r--gpxe/src/core/settings.c2
-rw-r--r--gpxe/src/include/gpxe/settings.h1
4 files changed, 6 insertions, 3 deletions
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