[Debian-live-changes] r921 - in dists/trunk/live-helper: helpers templates/grub

[Daniel Baumann]

Author: daniel
Date: 2007-04-02 14:13:40 +0000 (Mon, 02 Apr 2007)
New Revision: 921

Modified:
   dists/trunk/live-helper/helpers/lh_binary_grub
   dists/trunk/live-helper/templates/grub/menu.lst
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub	2007-04-02 13:20:21 UTC (rev 920)
+++ dists/trunk/live-helper/helpers/lh_binary_grub	2007-04-02 14:13:40 UTC (rev 921)
@@ -117,10 +117,10 @@
 	if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
 	then
 		DEFAULT_FLAVOUR="`echo ${LIVE_KERNEL_FLAVOUR} | awk '{ print $1 }'`"
-		LINUX="title\tDebian GNU/Linux - Live\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"
+		LINUX="title\t\tDebian GNU/Linux - Live\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="title\tDebian GNU/Linux - Live\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"
+		LINUX="title\t\tDebian GNU/Linux - Live\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" ]
@@ -131,16 +131,16 @@
 			then
 				if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
 				then
-					LINUX="title\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nroot\t(cd)\nkernel\t/`basename ${DESTDIR}`/`basename ${KERNEL}`\ninitrd\t/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
+					LINUX="title\t\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nroot\t(cd)\nkernel\t/`basename ${DESTDIR}`/`basename ${KERNEL}`\ninitrd\t/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
 				else
-					LINUX="title\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nroot\t(cd)\nkernel\t`basename ${KERNEL}`\ninitrd\tinitrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
+					LINUX="title\t\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nroot\t(cd)\nkernel\t`basename ${KERNEL}`\ninitrd\tinitrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
 				fi
 			else
 				if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
 				then
-					LINUX="${LINUX}\n\ntitle\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nroot\t(cd)\nkernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\ninitrd\t/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
+					LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nroot\t(cd)\nkernel /`basename ${DESTDIR}`/`basename ${KERNEL}`\ninitrd\t/`basename ${DESTDIR}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
 				else
-					LINUX="${LINUX}\n\ntitle\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nroot\t(cd)\nkernel `basename ${KERNEL}`\ninitrd\tinitrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
+					LINUX="${LINUX}\n\ntitle\t\tDebian GNU/Linux - Live, kernel `basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nroot\t(cd)\nkernel `basename ${KERNEL}`\ninitrd\tinitrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=casper LIVE_BOOTAPPEND"
 				fi
 			fi
 		done
@@ -153,10 +153,10 @@
 	then
 		if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
 		then
-			MEMTEST="title\tMemtest86+\nroot\t(cd)\nkernel\t/`basename ${DESTDIR}`/memtest"
+			MEMTEST="title\t\tMemtest86+\nroot\t(cd)\nkernel\t/`basename ${DESTDIR}`/memtest"
 			MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
 		else
-			MEMTEST="title\tMemtest86+\nroot\t(cd)\nkernel\tmemtest"
+			MEMTEST="title\t\tMemtest86+\nroot\t(cd)\nkernel\tmemtest"
 		fi
 	fi
 
@@ -175,6 +175,17 @@
 			fi
 
 			# Configure grub templates
+
+			cat >> binary/boot/grub/menu.lst << EOF
+# This is a divider, added to separate the menu items below from the Debian
+# ones.
+title		Other:
+root
+
+
+LIVE_MEMTEST
+EOF
+
 			sed -i -e "s#LIVE_KERNEL_LIVE#${LINUX}#" -e "s#LIVE_MEMTEST#${MEMTEST}#" binary/boot/grub/menu.lst
 			sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/boot/grub/menu.lst
 			;;

Modified: dists/trunk/live-helper/templates/grub/menu.lst
===================================================================
--- dists/trunk/live-helper/templates/grub/menu.lst	2007-04-02 13:20:21 UTC (rev 920)
+++ dists/trunk/live-helper/templates/grub/menu.lst	2007-04-02 14:13:40 UTC (rev 921)
@@ -119,6 +119,4 @@
 
 LIVE_KERNEL_INSTALL
 
-LIVE_MEMTEST
-
 ### END DEBIAN AUTOMAGIC KERNELS LIST