From 2935c44dbb745fd5d1cea63adc0a5be7308ee002 Mon Sep 17 00:00:00 2001
From: Michael Shigorin <mike@altlinux.org>
Date: Thu, 14 Jun 2012 00:52:31 +0300
Subject: [PATCH] syslinux: get rid of ^s with gfxboot

Keyboard accelerators rather make sense
with menu/vesamenu UI.
---
 features.in/syslinux/generate.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/features.in/syslinux/generate.mk b/features.in/syslinux/generate.mk
index 7b3561fc..ce066ab5 100644
--- a/features.in/syslinux/generate.mk
+++ b/features.in/syslinux/generate.mk
@@ -48,14 +48,14 @@ cfg = $(wildcard cfg.in/??$(1).cfg)
 #
 # arguments get evaluated before recipe body execution thus prep
 
-all: debug timeout bootargs
+all: debug timeout
 	@### proper text branding should be implemented
 	@sed -i 's,@mkimage-profiles@,$(IMAGE_NAME),' $(DSTDIR)/*.cfg
 	@echo $(SYSLINUX_MODULES) > $(DSTDIR)/modules.list
 	@echo $(SYSLINUX_FILES) > $(DSTDIR)/syslinux.list
 
 # integerity check
-timeout: copy
+timeout: bootargs
 	@if [ "$(SYSLINUX_TIMEOUT)" -ge 0 ] 2>/dev/null; then \
 		TIMEOUT="$(SYSLINUX_TIMEOUT)"; \
 	else \
@@ -64,12 +64,17 @@ timeout: copy
 	sed -i "s,@timeout@,$$TIMEOUT," $(DSTDIR)/*.cfg
 
 # pass over additional parameters, if any
-bootargs: copy
+bootargs: clean
 	@if [ -n "$(INSTALL2_BOOTARGS)" ]; then \
 		sed -i "s,@bootargs@,$(INSTALL2_BOOTARGS)," $(DSTDIR)/*.cfg; \
 	fi; \
 	sed -i "s,@bootargs@,," $(DSTDIR)/*.cfg
 
+clean: copy
+	@if [ "$(SYSLINUX_UI)" = gfxboot ]; then \
+		sed -i "s,\^,," $(DSTDIR)/*.cfg; \
+	fi
+
 copy: prep
 	@cp -pLt $(DSTDIR) -- $(sort \
 		$(foreach C,$(SYSLINUX_CFG),$(call cfg,$(C))) \