[Debian-live-changes] r915 - dists/trunk/live-helper/helpers

[Daniel Baumann]

Author: daniel
Date: 2007-04-01 20:33:41 +0000 (Sun, 01 Apr 2007)
New Revision: 915

Modified:
   dists/trunk/live-helper/helpers/lh_binary_grub
   dists/trunk/live-helper/helpers/lh_binary_iso
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-04-01 19:51:35 UTC (rev 914)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-04-01 20:33:41 UTC (rev 915)
@@ -121,10 +121,10 @@
 	if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
 	then
 		DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`"
-		LINUX="label linux\n  kernel /`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n  append initrd=/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
+		LINUX="title\tlinux\nroot\t(cd)\nkernel\t/`basename ${DESTDIR}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\ninitrd\t/`basename ${DESTDIR}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
 	else
 		DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`"
-		LINUX="label linux\n  kernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n  append initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
+		LINUX="title\tlinux\nroot\t(cd)\nkernel\t`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\ninitrd\tinitrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
 	fi
 
 	if [ "`echo ${LIVE_KERNEL_FLAVOUR} | wc -w`" -gt "1" ]

Modified: dists/trunk/live-helper/helpers/lh_binary_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_iso	2007-04-01 19:51:35 UTC (rev 914)
+++ dists/trunk/live-helper/helpers/lh_binary_iso	2007-04-01 20:33:41 UTC (rev 915)
@@ -79,7 +79,9 @@
 			then
 				#Chroot "${LH_GENISOIMAGE} -A \"Debian Live\" -p \"Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org\" -publisher \"Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org\" -o binary.iso -r -J -l -V \"${LIVE_ISO_VOLUME}\" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary"
 				Chroot "${LH_GENISOIMAGE} -o binary.iso -r -J -l -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary"
-			elif [ "${LIVE_GRUB}" = "enabled" ]
+			fi
+
+			if [ "${LIVE_GRUB}" = "enabled" ]
 			then
 				Chroot "${LH_GENISOIMAGE} -o binary.iso -r -J -l -b -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table binary"
 			fi