From d3e40e850f62da372296e98db701c2dfb202bffc Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Mon, 17 May 2010 14:14:21 -0700 Subject: [PATCH] Restore skip CR and LF in the comboot API copies of the banner strings The comboot API should not report leading CR and LF in the banner strings. This was done in 3.86, but apparently was lost due to mismerge (52c9d5ba2af4e1f77aa2486a2af2bcab0b0af52c) in the 4.00 branch. Signed-off-by: H. Peter Anvin --- core/comboot.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/comboot.inc b/core/comboot.inc index b714dd4..45b770f 100644 --- a/core/comboot.inc +++ b/core/comboot.inc @@ -458,9 +458,9 @@ comapi_get_version: mov P_ES,ds ; ES:SI -> version banner - mov P_SI,syslinux_banner + mov P_SI,syslinux_banner + 2 ; Skip leading CR LF ; ES:DI -> copyright string - mov P_DI,copyright_str + mov P_DI,copyright_str + 1 ; Skip leading space comapi_nop: clc -- 2.7.4