summaryrefslogtreecommitdiff
path: root/templates/grub
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:04:49 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:18:29 +0100
commitda353a5231ad925013d01065768864307c70651a (patch)
tree589606906e4e8966797f352ec63162cbb4016da0 /templates/grub
parent068a51b175546dfeac45c747236817cb41db50d7 (diff)
downloadlive-build-da353a5231ad925013d01065768864307c70651a.zip
live-build-da353a5231ad925013d01065768864307c70651a.tar.gz
Adding live-helper 1.0~a4-1.
Diffstat (limited to 'templates/grub')
-rw-r--r--templates/grub/menu.lst27
1 files changed, 8 insertions, 19 deletions
diff --git a/templates/grub/menu.lst b/templates/grub/menu.lst
index 843a135..30100ef 100644
--- a/templates/grub/menu.lst
+++ b/templates/grub/menu.lst
@@ -16,7 +16,7 @@ default 0
## 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 @@ color cyan/blue white/blue
## 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,10 @@ color cyan/blue white/blue
## ## 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
-
-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
-
-title memtest86+ RAM tester
-root (cd)
-kernel /boot/memtest
-savedefault
+LIVE_SPLASH
+
+LIVE_KERNEL_LIVE
+
+LIVE_KERNEL_INSTALL
### END DEBIAN AUTOMAGIC KERNELS LIST