[SCM] debian-live/live-helper branch, master, updated. 1.0_a34-1-6-gb2068cd

[Jesse Hathaway]

The branch, master has been updated
       via  b2068cd6914c9b766756b6921e9ae59bfd9e4429 (commit)
      from  890801563d0c63e1af88fefb82bccc5715d3af9b (commit)


- Shortlog ------------------------------------------------------------
b2068cd fix isolinux when booting multiple kernel flavours

Summary of changes:
 helpers/lh_binary_syslinux |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit b2068cd6914c9b766756b6921e9ae59bfd9e4429
Author: Jesse Hathaway <jesse at mbuki-mvuki.org>
Date:   Wed Oct 31 16:20:57 2007 -0400

    fix isolinux when booting multiple kernel flavours

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 5e87d75..109f96d 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -100,7 +100,7 @@ Syslinux_live_entry ()
 
    if [ ${LH_BINARY_IMAGES} = "iso" ] || [ ${LH_BINARY_IMAGES} = "usb-hdd" ]
    then
-      num=$(ls -1 ${KERNEL_PATH}|grep 'vmlinuz.\.img$'|wc -l)
+      num=$(ls -1 ${KERNEL_PATH}|grep 'vmlinuz[0-9]\+$'|wc -l)
       num=$(($num +1))
       # Note: ISOLINUX will not find the kernel if the name ends in ".img".
       mv ${KERNEL_PATH}/${KERNEL} ${KERNEL_PATH}/vmlinuz${num}
@@ -473,13 +473,14 @@ Syslinux_live_entry "live" "${LH_SYSLINUX_MENU_LIVE_ENTRY}" "${DEFAULT_KERNEL}"
 
 if [ "$(echo ${LH_LINUX_FLAVOURS} | wc -w)" -gt "1" ]
 then
-	for KERNEL in chroot/boot/vmlinuz-*
+	for FLAVOUR in ${LH_LINUX_FLAVOURS}
 	do
-		KERNEL_IMAGE="$(basename ${KERNEL})"
-		KERNEL_VERSION="$(echo ${KERNEL_IMAGE} | sed -e 's/vmlinuz-//')"
-		INITRD="initrd.img-${KERNEL_VERSION}"
-
-		Syslinux_live_entry "live-${KERNEL_VERSION}" "${LH_SYSLINUX_MENU_LIVE_ENTRY}" "${KERNEL_IMAGE}" "${INITRD}"
+		if [ "${FLAVOUR}" != "${DEFAULT_FLAVOUR}" ]
+		then
+			FLAVOUR_KERNEL="$(basename chroot/boot/vmlinuz-*${FLAVOUR})"
+			FLAVOUR_INITRD="initrd.img-$(echo ${FLAVOUR_KERNEL} | sed -e 's/vmlinuz-//')"
+			Syslinux_live_entry "live-${FLAVOUR}" "${LH_SYSLINUX_MENU_LIVE_ENTRY} ${FLAVOUR}" "${FLAVOUR_KERNEL}" "${FLAVOUR_INITRD}"
+		fi
 	done
 fi
 

-- 
debian-live/live-helper