From: Daniel Verkamp Date: Mon, 1 Mar 2010 01:55:13 +0000 (+0000) Subject: [comboot] Match version strings to SYSLINUX style X-Git-Tag: v1.20.1~2732 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12defeca99fcb522f295ba2b906f25a5a0012958;p=thirdparty%2Fipxe.git [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 --- diff --git a/src/arch/i386/interface/syslinux/comboot_call.c b/src/arch/i386/interface/syslinux/comboot_call.c index 0a17bf130..51a1b6d9a 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, [] ) = "";