From bcb1e6f7d514e37df4db39fab595277f9e701ba6 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 1 Nov 2009 13:35:56 +0100
Subject: Fixing regression imported by fixing #533846 incorrectly.
---
helpers/lh_binary_syslinux | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 6a064ad..d43ce12 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -193,9 +193,12 @@ Copy_syslinux_templates ()
;;
*)
- LH_SYSLINUX_CFG="${LH_SYSLINUX_CFG:-${TEMPLATES}/menu/syslinux.cfg}"
-
- MENUMODULE=$(grep 'menu.c32' ${LH_SYSLINUX_CFG} | sed 's|default\s*.*/\(.*menu.c32\)$|\1|g')
+ if [ -z "${LH_SYSLINUX_CFG}" ]
+ then
+ MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/syslinux.cfg | sed 's|default\s*.*/\(.*menu.c32\)$|\1|g')
+ else
+ LH_SYSLINUX_CFG="${LH_SYSLINUX_CFG:-${TEMPLATES}/menu/syslinux.cfg}"
+ fi
;;
esac
--
cgit v1.0