manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syslinux: properly change timeout and do not fail if help files do not exists

This commit is contained in:
Otavio Salvador 2007-10-09 10:27:27 -03:00
parent 9b189a6255
commit 4d6271dddb
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
helpers/lh_binary_syslinux
View File

@ -656,10 +656,15 @@ case "${LH_BINARY_IMAGES}" in
# Configure syslinux templates # 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@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_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 if [ -e binary/isolinux/f1.txt ]
sed -i -e "s/LH_MEDIA/hd-media/" "${DESTDIR}"/f3.txt #FIXME then
sed -i -e "s/LH_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt 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 # Workaround for syslinux (<< 3.36) which doesn't support long file/path names
if [ "$(echo ${LH_LINUX_FLAVOURS} | wc -w)" -gt "1" ] if [ "$(echo ${LH_LINUX_FLAVOURS} | wc -w)" -gt "1" ]
then then
@ -676,11 +681,11 @@ case "${LH_BINARY_IMAGES}" in
mv "${DESTDIR_LIVE}"/vmlinuz-*-${LH_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz mv "${DESTDIR_LIVE}"/vmlinuz-*-${LH_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
mv "${DESTDIR_LIVE}"/initrd.img-*-${LH_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img 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/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 sed -i -e "s/LINUX_TIMEOUT/${LH_SYSLINUX_TIMEOUT}/" "${DESTDIR}"/footer.cfg
# Remove whitespaces
sed -i -e 's/\ $//g' "${DESTDIR}"/menu.cfg
fi fi
# Remove whitespaces
sed -i -e 's/\ $//g' "${DESTDIR}"/*.cfg
;; ;;
esac esac