Otavio Salvador wrote:
> Peter Skogström <[EMAIL PROTECTED]> writes:
>
>> There are some syslinux errors when building lenny with usb-hdd (it
>> misses some include .cfg files and the menu labels seems not expanded).
>
> Please, test my snapshots since it had some more fixes on syslinux.
>
Hi Otavio
I did my diff against lh_binary_syslinux live-helpe1.0~a30-1
but I have now taken a look at a31 and the fixes are not related.
This patch makes usb-hdd work, both with and without LH_SYSLINUX_MENU
enabled.
I have only checked usb-hdd not pxeboot, I also found some minor errors
afterwards (I think it was that I dont see the live-safe label with the
vesamenu.)
This is my first patch to debian, I have found bugs and done oneliners
before, but have some indulgence if I have done something wrong.
So what does this patch do:
1. I commented out this section, but I guess it can be removed as well.
First its an error, it copies isolinux.bin to syslinux.bin. But it
doesnt matter because there are no syslinux.bin in syslinux. For the
usb-hdd case we use syslinux and its loader is called ldlinux.sys (if I
recall correct) and that one is installed with the command syslinux
(taken care elsewhere)
I also copies the template section from the iso case (that we know works
good) and replaces some with $(DESTDIR) becasue here we have two
possible paths, because of the (if << syslinux 3.36) stuff.
2.
Here adding the vesamenu also.
3.
Some more commenting out stuff (bad habit)
changes syslinux.cfg to menu.cfg
4.
Some more syslinux.cfg to menu.cfg and also the correct place for
${LH_SYSLINUX_TIMEOUT} timeout is footer.cfg
Intresting also how you managed the CONFIG directive (in syslinux conf
files) to work, I just yesterday made some testing and I didnt managed
it to work at all. See the syslinux maillist for my test. To late for me
to check now (my head should be on the pillow many hours ago).
regards
//Peter
--
bitrunner
0708-460260
Andra Långgatan 28
41327 Göteborg
Sweden
--- lh_binary_syslinux 2007-10-07 09:03:36.000000000 +0200
+++ lh_binary_syslinux_ok 2007-10-08 11:13:40.000000000 +0200
@@ -584,18 +584,34 @@
# Copying syslinux
mkdir -p "${DESTDIR}"
- case "${LH_CHROOT_BUILD}" in
- enabled)
- cp chroot/usr/lib/syslinux/isolinux.bin
"${DESTDIR}"/syslinux.bin
- ;;
-
- disabled)
- cp /usr/lib/syslinux/isolinux.bin
"${DESTDIR}"/syslinux.bin
- ;;
- esac
+
+
+ # case "${LH_CHROOT_BUILD}" in
+ # enabled)
+ # cp chroot/usr/lib/syslinux/syslinux.bin
"${DESTDIR}"/syslinux.bin
+ # ;;
+ #
+ # disabled)
+ # cp /usr/lib/syslinux/syslinux.bin
"${DESTDIR}"/syslinux.bin
+ # ;;
+ # esac
cp -r "${TEMPLATES}"/common/* "${DESTDIR}"
- cp -r "${TEMPLATES}"/"${LH_LANGUAGE}"/* "${DESTDIR}"
+
+ if [ "${LH_SYSLINUX_MENU}" = "disabled" ]
+ then
+ cp -r "${TEMPLATES}"/normal/* "${DESTDIR}"
+ else
+ cp -r "${TEMPLATES}"/menu/* "${DESTDIR}"
+ fi
+
+ if [ -d "${TEMPLATES}"/"${LH_LANGUAGE}" ]
+ then
+ cp -r "${TEMPLATES}"/"${LH_LANGUAGE}"/* "${DESTDIR}"
+ else
+ cp -r "${TEMPLATES}"/en/* "${DESTDIR}"
+ fi
+
for FILE in "${DESTDIR}"/*.live
do
@@ -628,6 +644,18 @@
cp config/binary_syslinux/syslinux.cfg
"${DESTDIR}"/syslinux.cfg
fi
+
+ # Copying menu module
+ if [ "${LH_SYSLINUX_MENU}" != "disabled" ]
+ then
+ MENUPATH="$(grep 'menu.c32' "${DESTDIR}"/header.cfg |
sed 's,default\s*\(.*menu.c32\)$,\1,g')"
+ MENUMODULE="$(basename ${MENUPATH})"
+
+ #mkdir -p binary/isolinux/"$(dirname ${MENUPATH})"
+ cp chroot/usr/lib/syslinux/"${MENUMODULE}"
"${DESTDIR}"/"$(dirname ${MENUPATH})"
+ fi
+
+
# Copying splash screen
if [ -f config/binary_syslinux/splash.rle ]
then
@@ -645,12 +673,25 @@
fi
fi
+# # Configure syslinux templates
+# sed -i -e "[EMAIL PROTECTED]@${LINUX_LIVE}@" -e "[EMAIL
PROTECTED]@${LINUX_INSTALL}@" -e "[EMAIL PROTECTED]@${MEMTEST}@"
"${DESTDIR}"/syslinux.cfg
+# sed -i -e "s#LH_BOOTAPPEND_INSTALL#${LH_BOOTAPPEND_INSTALL}#"
-e "s#LH_BOOTAPPEND_LIVE#${LH_BOOTAPPEND_LIVE}#" "${DESTDIR}"/syslinux.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
+
# Configure syslinux templates
- sed -i -e "[EMAIL PROTECTED]@${LINUX_LIVE}@" -e "[EMAIL
PROTECTED]@${LINUX_INSTALL}@" -e "[EMAIL PROTECTED]@${MEMTEST}@"
"${DESTDIR}"/syslinux.cfg
- sed -i -e "s#LH_BOOTAPPEND_INSTALL#${LH_BOOTAPPEND_INSTALL}#"
-e "s#LH_BOOTAPPEND_LIVE#${LH_BOOTAPPEND_LIVE}#" "${DESTDIR}"/syslinux.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
+ sed -i -e "[EMAIL PROTECTED]@${LINUX_LIVE}@" -e "[EMAIL
PROTECTED]@${LINUX_INSTALL}@" -e "[EMAIL PROTECTED]@${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
+ if [ -e "${DESTDIR}"/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 "${DESTDIR}"/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" ]
@@ -667,8 +708,11 @@
else
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}"/syslinux.cfg
- sed -i -e "s/LINUX_TIMEOUT/${LH_SYSLINUX_TIMEOUT}/"
"${DESTDIR}"/syslinux.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}"/footer.cfg
+
+
# Remove whitespaces
sed -i -e 's/\ $//g' "${DESTDIR}"/syslinux.cfg
_______________________________________________
debian-live-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-live-devel
