summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-11-15 16:29:34 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:49 +0100
commitcea57867f5783e57986f4ad05ddbf56f3cc18141 (patch)
treed632307c8f882d769149eeee799d30acfdcbf723
parent91b9dab63795596ebd1f4bf9666a2ac2d5e2d140 (diff)
downloadvyos-live-build-cea57867f5783e57986f4ad05ddbf56f3cc18141.tar.gz
vyos-live-build-cea57867f5783e57986f4ad05ddbf56f3cc18141.zip
Adding another workaround for etchs syslinux generation to manually treat live.cfg.
-rwxr-xr-xhelpers/lh_binary_syslinux8
1 files changed, 7 insertions, 1 deletions
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 154306ff1..813084c97 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -357,7 +357,7 @@ Configure_syslinux_templates ()
then
while grep -qs ^include ${SCREEN_PATH}/syslinux.cfg
do
- INCLUDES=$(grep ^include ${SCREEN_PATH}/syslinux.cfg |awk '{print $2}')
+ INCLUDES=$(grep ^include ${SCREEN_PATH}/syslinux.cfg | awk '{print $2}')
for FILE_PATH in ${INCLUDES}
do
@@ -376,6 +376,12 @@ Configure_syslinux_templates ()
done
done
+ if [ -e ${SCREEN_PATH}/live.cfg ]
+ then
+ cat ${SCREEN_PATH}/live.cfg >> ${SCREEN_PATH}/syslinux.cfg
+ rm -f ${SCREEN_PATH}/live.cfg
+ fi
+
# Syslinux v3.31 in etch does not support sub directories, /path/kernel,
# when using FAT hard drive images, remove leading /'s
if [ "${LH_BINARY_IMAGES}" = "usb-hdd" ]