Adding live-helper 1.0~a6-1.

6 files changed, 29 insertions, 122 deletions

diff --git a/templates/grub/menu.lst b/templates/grub/menu.lst
index 30100ef43..22355b84d 100644
--- a/templates/grub/menu.lst
+++ b/templates/grub/menu.lst
@@ -1,124 +1,7 @@
-# menu.lst - See: grub(8), info grub, update-grub(8)
-#            grub-install(8), grub-floppy(8),
-#            grub-md5-crypt, /usr/share/doc/grub
-#            and /usr/share/doc/grub-doc/.
-
-## default num
-# Set the default entry to the entry number NUM. Numbering starts from 0, and
-# the entry number 0 is the default if the command is not used.
-#
-# You can specify 'saved' instead of a number. In this case, the default entry
-# is the entry saved with the command 'savedefault'.
-# WARNING: If you are using dmraid do not change this entry to 'saved' or your
-# array will desync and will not let you boot your system.
-default		0
-
-## timeout sec
-# Set a timeout, in SEC seconds, before automatically booting the default entry
-# (normally the first entry defined).
-#timeout	5
-
-# Pretty colours
+default 0
 color cyan/blue white/blue
-
-## password ['--md5'] passwd
-# If used in the first section of a menu file, disable all interactive editing
-# control (menu entry editor and command-line)  and entries protected by the
-# command 'lock'
-# e.g. password topsecret
-#      password --md5 $1$gLhU0/$aW78kHK1QfV3P2b2znUoe/
-# password topsecret
-
-#
-# examples
-#
-# title		Windows 95/98/NT/2000
-# root		(hd0,0)
-# makeactive
-# chainloader	+1
-#
-# title		Linux
-# root		(hd0,1)
-# kernel	/vmlinuz root=/dev/hda2 ro
-#
-
-#
-# Put static boot stanzas before and/or after AUTOMAGIC KERNEL LIST
-
-### BEGIN AUTOMAGIC KERNELS LIST
-## lines between the AUTOMAGIC KERNELS LIST markers will be modified
-## by the debian update-grub script except for the default options below
-
-## DO NOT UNCOMMENT THEM, Just edit them to your needs
-
-## ## Start Default Options ##
-## default kernel options
-## default kernel options for automagic boot options
-## If you want special options for specific kernels use kopt_x_y_z
-## where x.y.z is kernel version. Minor versions can be omitted.
-## 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=root=/dev/hda1 ro
-
-## default grub root device
-## e.g. groot=(hd0,0)
-# groot=(hd0,0)
-
-## should update-grub create alternative automagic boot options
-## e.g. alternative=true
-##      alternative=false
-# alternative=true
-
-## should update-grub lock alternative automagic boot options
-## e.g. lockalternative=true
-##      lockalternative=false
-# lockalternative=false
-
-## additional options to use with the default boot option, but not with the
-## alternatives
-## e.g. defoptions=vga=791 resume=/dev/hda5
-# defoptions=
-
-## should update-grub lock old automagic boot options
-## e.g. lockold=false
-##      lockold=true
-# lockold=false
-
-## Xen hypervisor options to use with the default Xen boot option
-# xenhopt=
-
-## Xen Linux kernel options to use with the default Xen boot option
-# xenkopt=console=tty0
-
-## altoption boot targets option
-## multiple altoptions lines are allowed
-## e.g. altoptions=(extra menu suffix) extra boot options
-##      altoptions=(single-user) single
-# altoptions=(single-user mode) single
-
-## controls how many kernels should be put into the menu.lst
-## only counts the first occurence of a kernel, not the
-## alternative kernel options
-## e.g. howmany=all
-##      howmany=7
-# howmany=all
-
-## should update-grub create memtest86 boot option
-## e.g. memtest86=true
-##      memtest86=false
-# memtest86=true
-
-## should update-grub adjust the value of the default booted system
-## can be true or false
-# updatedefaultentry=false
-
-## ## End Default Options ##
-
-LIVE_SPLASH
+splashimage /boot/grub/splash.xpm.gz
 
 LIVE_KERNEL_LIVE
 
 LIVE_KERNEL_INSTALL
-
-### END DEBIAN AUTOMAGIC KERNELS LIST
diff --git a/templates/grub/splash.xpm.gz b/templates/grub/splash.xpm.gz
new file mode 100644
index 000000000..ea1623b4d
--- /dev/null
+++ b/templates/grub/splash.xpm.gz
diff --git a/templates/syslinux/f3.txt b/templates/syslinux/f3.txt
index 091028229..e987a61dd 100644
--- a/templates/syslinux/f3.txt
+++ b/templates/syslinux/f3.txt
@@ -2,7 +2,7 @@
 
 0fAvailable boot methods:07
 
-0flinux07
+0flive07
   Start the live system -- this is the default CD-ROM mode.
 0fmemtest07
   Start the memtest86+ RAM tester.
@@ -10,7 +10,7 @@
 To use one of these boot methods, type it at the prompt, optionally
 followed by any boot parameters. For example:
 
-  boot: linux foo=bar
+  boot: live foo=bar
 
 If unsure, you should use the default boot method, with no special
 parameters, by simply pressing enter at the boot prompt.
diff --git a/templates/syslinux/f4.txt b/templates/syslinux/f4.txt
index 24198cbfe..a8bd4e0c7 100644
--- a/templates/syslinux/f4.txt
+++ b/templates/syslinux/f4.txt
@@ -14,7 +14,7 @@ Set initial display mode               0fvga=<mode>07
 
 For example:
 
-  boot: linux quiet vga=792 locale=it_IT.UTF-8
+  boot: live quiet vga=792 locale=it_IT.UTF-8
 
 
 
diff --git a/templates/yaboot/boot.msg b/templates/yaboot/boot.msg
new file mode 100644
index 000000000..9c25a9c47
--- /dev/null
+++ b/templates/yaboot/boot.msg
@@ -0,0 +1,18 @@
+Welcome to Debian GNU/Linux
+
+This is an Debian Live CDROM,
+built on LIVE_DATE.
+
+The default option is 'live'.
+
+If the system fails to boot at all (the typical
+symptom is a white screen which doesn't go away),
+use 'live video=ofonly'.
+
+Press the tab key for a list of options, or type
+'help' for help.
+
+************************************
+If in doubt, just press Enter, and if that
+doesn't work, type 'live video=ofonly'.
+************************************
diff --git a/templates/yaboot/yaboot.conf b/templates/yaboot/yaboot.conf
new file mode 100644
index 000000000..8170d7046
--- /dev/null
+++ b/templates/yaboot/yaboot.conf
@@ -0,0 +1,6 @@
+default=live
+message=/install/boot.msg
+
+LIVE_KERNEL_LIVE
+
+LIVE_KERNEL_INSTALL