summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2007-10-09 10:27:27 -0300
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:22:27 +0100
commite1b10bc5175b2f5fc43fae879bf32fea9dbab8f4 (patch)
treea64fbfc735659821cdb8a5c8694a0f980fe35192 /helpers
parent96376fdadb8d89d01463a10b46b52d251e7152e3 (diff)
downloadvyos-live-build-e1b10bc5175b2f5fc43fae879bf32fea9dbab8f4.tar.gz
vyos-live-build-e1b10bc5175b2f5fc43fae879bf32fea9dbab8f4.zip
syslinux: properly change timeout and do not fail if help files do not exists
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/lh_binary_syslinux21
1 files changed, 13 insertions, 8 deletions
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index a6f30675a..589c34862 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -656,10 +656,15 @@ case "${LH_BINARY_IMAGES}" in
# Configure syslinux templates
sed -i -e "s@LINUX_LIVE@${LINUX_LIVE}@" -e "s@LINUX_INSTALL@${LINUX_INSTALL}@" -e "s@MEMTEST@${MEMTEST}@" "${DESTDIR}"/menu.cfg
sed -i -e "s#LH_BOOTAPPEND_INSTALL#${LH_BOOTAPPEND_INSTALL}#" -e "s#LH_BOOTAPPEND_LIVE#${LH_BOOTAPPEND_LIVE}#" "${DESTDIR}"/menu.cfg
- sed -i -e "s/LH_DISTRIBUTION/${LH_DISTRIBUTION}/" -e "s/LH_DATE/$(date +%Y%m%d)/" -e "s/LH_MEDIA/hd-media/" "${DESTDIR}"/f1.txt #FIXME
- sed -i -e "s/LH_MEDIA/hd-media/" "${DESTDIR}"/f3.txt #FIXME
- sed -i -e "s/LH_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt
-
+ if [ -e binary/isolinux/f1.txt ]
+ then
+ sed -i -e "s/LH_DISTRIBUTION/${LH_DISTRIBUTION}/" -e "s/LH_DATE/$(date +%Y%m%d)/" -e "s/LH_MEDIA/hd-media/" "${DESTDIR}"/f1.txt
+ fi
+ sed -i -e "s/LH_MEDIA/hd-media/" "${DESTDIR}"/f3.txt
+ if [ -e binary/isolinux/f10.txt ]
+ then
+ sed -i -e "s/LH_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt
+ fi
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
if [ "$(echo ${LH_LINUX_FLAVOURS} | wc -w)" -gt "1" ]
then
@@ -676,11 +681,11 @@ case "${LH_BINARY_IMAGES}" in
mv "${DESTDIR_LIVE}"/vmlinuz-*-${LH_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
mv "${DESTDIR_LIVE}"/initrd.img-*-${LH_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
sed -i -e "s/vmlinuz-.*-${LH_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LH_LINUX_FLAVOURS}/initrd.img/g" "${DESTDIR}"/menu.cfg
- sed -i -e "s/LINUX_TIMEOUT/${LH_SYSLINUX_TIMEOUT}/" "${DESTDIR}"/menu.cfg
-
- # Remove whitespaces
- sed -i -e 's/\ $//g' "${DESTDIR}"/menu.cfg
+ sed -i -e "s/LINUX_TIMEOUT/${LH_SYSLINUX_TIMEOUT}/" "${DESTDIR}"/footer.cfg
fi
+
+ # Remove whitespaces
+ sed -i -e 's/\ $//g' "${DESTDIR}"/*.cfg
;;
esac