[SCM] live-helper branch, master, updated. 1.0.5-2-29-g9471995
Daniel Baumann
daniel at debian.org
Tue Oct 20 14:58:21 UTC 2009
The following commit has been merged in the master branch:
commit 94719950bd2f4cc82cc0a7d681d1a99058666a4d
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Oct 20 16:16:01 2009 +0200
Respecting (possibly) customized LH_SYSLINUX_CFG when autodecting syslinux menu module (Closes: #533846).
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index c9f7b5c..6a064ad 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -193,7 +193,9 @@ Copy_syslinux_templates ()
;;
*)
- MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/syslinux.cfg | sed 's|default\s*.*/\(.*menu.c32\)$|\1|g')
+ 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')
;;
esac
--
live-helper
More information about the debian-live-changes
mailing list