Hello,
Please accept this patch to use a relative paths to splash and vesamenu.c32
to avoid complications when an ISO is converted into a usb image. This
change is also beneficial on the merit that it simplifies the code - instead
of us worrying about the paths and carrying that data around with us to
generate config files correctly we just need to place the files inside
isolinux/syslinux's directory as the bootloader looks there for files given
to it with a relative path.
Cheers,
--
Cody A.W. Somerville
Software Systems Release Engineer
Foundations Team
Custom Engineering Solutions Group
Canonical OEM Services
Phone: +1-781-850-2087
Cell: +1-506-471-8402
Email: cody.somervi...@canonical.com
=== modified file 'helpers/lh_binary_syslinux'
--- helpers/lh_binary_syslinux 2009-06-08 05:36:05 +0000
+++ helpers/lh_binary_syslinux 2009-11-08 14:22:28 +0000
@@ -180,7 +186,7 @@
cp "${TEMPLATES}"/menu/* ${SCREEN_PATH}
# Grab menu binary
- MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/syslinux.cfg | sed 's|default\s*.*/\(.*menu.c32\)$|\1|g')
+ MENUMODULE=$(basename $(grep -m1 'menu.c32' ${TEMPLATES}/menu/syslinux.cfg | cut -d' ' -f2))
case "${LH_CHROOT_BUILD}" in
enabled)
cp chroot/usr/lib/syslinux/"${MENUMODULE}" ${DATA_PATH}
@@ -253,9 +259,9 @@
else
if [ "${LH_SYSLINUX_MENU}" = "disabled" ]
then
- SPLASH="${LIVE_DATA_PATH}/splash.rle"
+ SPLASH="splash.rle"
else
- SPLASH="${LIVE_DATA_PATH}/splash.png"
+ SPLASH="splash.png"
fi
if [ -n "${LH_SYSLINUX_SPLASH}" ]
=== modified file 'templates/syslinux/menu/exithelp.cfg'
--- templates/syslinux/menu/exithelp.cfg 2009-02-14 11:14:36 +0000
+++ templates/syslinux/menu/exithelp.cfg 2009-10-04 05:06:35 +0000
@@ -1,3 +1,3 @@
label menu
- kernel {$LIVE_DATA_PATH}/vesamenu.c32
+ kernel vesamenu.c32
config isolinux.cfg
=== modified file 'templates/syslinux/menu/syslinux.cfg'
--- templates/syslinux/menu/syslinux.cfg 2009-02-14 11:14:36 +0000
+++ templates/syslinux/menu/syslinux.cfg 2009-10-04 05:06:35 +0000
@@ -1,4 +1,4 @@
include menu.cfg
-default {$LIVE_DATA_PATH}/vesamenu.c32
+default vesamenu.c32
prompt 0
timeout {$LH_SYSLINUX_TIMEOUT}
