summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Verkamp2010-03-01 02:55:13 +0100
committerMichael Brown2010-03-01 02:55:54 +0100
commit12defeca99fcb522f295ba2b906f25a5a0012958 (patch)
treec357cbdd55c8d647108ebff6f4f46e4587f62891
parent[vxge] Add support for X3100 series 10GbE Server/Storage Adapter (diff)
downloadipxe-12defeca99fcb522f295ba2b906f25a5a0012958.tar.gz
ipxe-12defeca99fcb522f295ba2b906f25a5a0012958.tar.xz
ipxe-12defeca99fcb522f295ba2b906f25a5a0012958.zip
[comboot] Match version strings to SYSLINUX style
In the actual SYSLINUX suite's comboot implementation, the version string is prefixed by CR LF, and the copyright string has a leading space. Some tools (specifically HDT) assume these padding characters exist, so we should probably return strings in a similar format. Signed-off-by: Michael Brown <mcb30@etherboot.org>
-rw-r--r--src/arch/i386/interface/syslinux/comboot_call.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/i386/interface/syslinux/comboot_call.c b/src/arch/i386/interface/syslinux/comboot_call.c
index 0a17bf13..51a1b6d9 100644
--- a/src/arch/i386/interface/syslinux/comboot_call.c
+++ b/src/arch/i386/interface/syslinux/comboot_call.c
@@ -43,11 +43,11 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include "config/serial.h"
/** The "SYSLINUX" version string */
-static char __data16_array ( syslinux_version, [] ) = "gPXE " VERSION;
+static char __data16_array ( syslinux_version, [] ) = "\r\ngPXE " VERSION;
#define syslinux_version __use_data16 ( syslinux_version )
/** The "SYSLINUX" copyright string */
-static char __data16_array ( syslinux_copyright, [] ) = "http://etherboot.org";
+static char __data16_array ( syslinux_copyright, [] ) = " http://etherboot.org";
#define syslinux_copyright __use_data16 ( syslinux_copyright )
static char __data16_array ( syslinux_configuration_file, [] ) = "";