[syslinux:elflink] PXELINUX: specify PXE/lwIP

syslinux-bot for Gene Cumm gene.cumm at gmail.com
Mon Sep 30 04:18:12 PDT 2013


Commit-ID:  960501d081bcde85648ebe24466dba35b239d95e
Gitweb:     http://www.syslinux.org/commit/960501d081bcde85648ebe24466dba35b239d95e
Author:     Gene Cumm <gene.cumm at gmail.com>
AuthorDate: Fri, 16 Aug 2013 12:52:58 -0400
Committer:  Gene Cumm <gene.cumm at gmail.com>
CommitDate: Mon, 23 Sep 2013 17:25:32 -0400

PXELINUX: specify PXE/lwIP

Styled after SYSLINUX

Signed-off-by: Gene Cumm <gene.cumm at gmail.com>

---
 core/macros.inc   | 5 +++++
 core/pxelinux.asm | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/macros.inc b/core/macros.inc
index e3aedca..c8fbe8d 100644
--- a/core/macros.inc
+++ b/core/macros.inc
@@ -31,6 +31,11 @@
 %endif
 %ifdef IS_PXELINUX
  %define MY_NAME 'PXELINUX'
+ %if IS_LPXELINUX > 0
+  %define MY_TYPE 'lwIP'
+ %else
+  %define MY_TYPE 'PXE'
+ %endif
 %else
  %define IS_PXELINUX 0
 %endif
diff --git a/core/pxelinux.asm b/core/pxelinux.asm
index 9d7156c..2c9b9f8 100644
--- a/core/pxelinux.asm
+++ b/core/pxelinux.asm
@@ -562,13 +562,14 @@ pxe_file_exit_hook:
 		section .data16
 
 		global copyright_str, syslinux_banner
-copyright_str   db ' Copyright (C) 1994-'
+copyright_str   db 'Copyright (C) 1994-'
 		asciidec YEAR
 		db ' H. Peter Anvin et al', CR, LF, 0
 err_bootfailed	db CR, LF, 'Boot failed: press a key to retry, or wait for reset...', CR, LF, 0
 bailmsg		equ err_bootfailed
 localboot_msg	db 'Booting from local disk...', CR, LF, 0
-syslinux_banner	db CR, LF, MY_NAME, ' ', VERSION_STR, ' ', DATE_STR, ' ', 0
+syslinux_banner	db CR, LF, MY_NAME, ' ', VERSION_STR, ' ', MY_TYPE, ' '
+		db DATE_STR, ' ', 0
 
 ;
 ; Misc initialized (data) variables


More information about the Syslinux-commits mailing list