[Debian-live-changes] r908 - in dists/trunk/live-helper: doc templates/grub

[Daniel Baumann]

Author: daniel
Date: 2007-04-01 18:59:34 +0000 (Sun, 01 Apr 2007)
New Revision: 908

Modified:
   dists/trunk/live-helper/doc/ChangeLog
   dists/trunk/live-helper/templates/grub/menu.lst
Log:


Modified: dists/trunk/live-helper/doc/ChangeLog
===================================================================
--- dists/trunk/live-helper/doc/ChangeLog	2007-04-01 18:37:04 UTC (rev 907)
+++ dists/trunk/live-helper/doc/ChangeLog	2007-04-01 18:59:34 UTC (rev 908)
@@ -1,3 +1,8 @@
+2006-04-01  Daniel Baumann  <daniel at debian.org>
+
+	* helper/lh_binary_grub:
+	  - Added.
+
 2006-03-30  Daniel Baumann  <daniel at debian.org>
 
 	* helper/lh_chroot_localincludes:

Modified: dists/trunk/live-helper/templates/grub/menu.lst
===================================================================
--- dists/trunk/live-helper/templates/grub/menu.lst	2007-04-01 18:37:04 UTC (rev 907)
+++ dists/trunk/live-helper/templates/grub/menu.lst	2007-04-01 18:59:34 UTC (rev 908)
@@ -16,7 +16,7 @@
 ## timeout sec
 # Set a timeout, in SEC seconds, before automatically booting the default entry
 # (normally the first entry defined).
-timeout		1
+timeout		5
 
 # Pretty colours
 color cyan/blue white/blue
@@ -59,11 +59,11 @@
 ## e.g. kopt=root=/dev/hda1 ro
 ##      kopt_2_6_8=root=/dev/hdc1 ro
 ##      kopt_2_6_8_2_686=root=/dev/hdc2 ro
-# kopt=CDLABEL=Debian-Live rootfstype=iso9660 ro
+# kopt=root=/dev/hda1 ro
 
 ## default grub root device
 ## e.g. groot=(hd0,0)
-# groot=(hd0,4)
+# groot=(hd0,0)
 
 ## should update-grub create alternative automagic boot options
 ## e.g. alternative=true
@@ -115,21 +115,8 @@
 
 ## ## End Default Options ##
 
-title		Debian Live (default)
-root		(cd)
-kernel		/boot/vmlinuz root=CDLABEL=Debian-Live rootfstype=iso9660 ro boot=casper
-initrd		/boot/initrd.img
-savedefault
+LIVE_KERNEL
 
-title		Debian Live (run from RAM)
-root		(cd)
-kernel		/boot/vmlinuz root=CDLABEL=Debian-Live rootfstype=iso9660 ro boot=casper toram
-initrd		/boot/initrd.img
-savedefault
+LIVE_MEMTEST
 
-title		memtest86+ RAM tester
-root		(cd)
-kernel		/boot/memtest
-savedefault
-
 ### END DEBIAN AUTOMAGIC KERNELS LIST