summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-11-01 16:47:15 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:09:48 +0100
commit634193980aa9b301de779bd57f72726fa55ddc6d (patch)
treed430933f5356537cc7c4281e01cd0ef70a7a835f
parent57a8ef8442a6ab37f1a56477a38e740fde4c0fde (diff)
downloadlive-build-634193980aa9b301de779bd57f72726fa55ddc6d.zip
live-build-634193980aa9b301de779bd57f72726fa55ddc6d.tar.gz
Correctly replacing pathes in exithelp.cfg for returning back to syslinux menu.
-rwxr-xr-xhelpers/lh_binary_syslinux19
1 files changed, 15 insertions, 4 deletions
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 29bd339..3f757e6 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -315,10 +315,21 @@ Configure_syslinux_templates ()
$template_file
done
- if [ -f "${SYSLINUX_PATH}/exithelp.cfg" ]
- then
- sed -i -e 's/isolinux.cfg/syslinux.cfg/' ${SYSLINUX_PATH}/exithelp.cfg
- fi
+ case "${LH_BINARY_IMAGES}" in
+ usb-hdd)
+ if [ -f "${SYSLINUX_PATH}/exithelp.cfg" ]
+ then
+ sed -i -e "s|config isolinux.cfg|config syslinux.cfg|" "${SYSLINUX_PATH}"/exithelp.cfg
+ fi
+ ;;
+
+ net)
+ if [ -f "${SCREEN_PATH}/exithelp.cfg" ]
+ then
+ sed -i -e "s|config isolinux.cfg|config ${LIVE_KERNEL_PATH}/pxelinux.cfg/default|" "${SCREEN_PATH}"/exithelp.cfg
+ fi
+ ;;
+ esac
# Syslinux v3.31 in etch does not support include statements
if [ "${LH_DISTRIBUTION}" = "etch" ]