aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-05-17 14:14:21 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2010-05-17 14:14:21 -0700
commitd3e40e850f62da372296e98db701c2dfb202bffc (patch)
treea09ad5e45c36165fd6aa643f8333118e59b6bad1
parent4f2568ba84172915df94995df4ad358d2f09cc0e (diff)
downloadsyslinux-d3e40e850f62da372296e98db701c2dfb202bffc.tar.gz
syslinux-d3e40e850f62da372296e98db701c2dfb202bffc.tar.xz
syslinux-d3e40e850f62da372296e98db701c2dfb202bffc.zip
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 <hpa@linux.intel.com>
-rw-r--r--core/comboot.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/comboot.inc b/core/comboot.inc
index b714dd4a..45b770f3 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