X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=templates%2Fboot%2Fisolinux%2Fsyslinux.cfg;h=4772423c2f7665ab392e13de9e8de4b5a235e7ce;hp=21ef56348ca48436797db6e727b598f0ff71661e;hb=7a964903823c6d9a6b51de4889ad48c3a44f1db1;hpb=4f8937bce96f552121e525eb927a2daea4dfae88

diff --git a/templates/boot/isolinux/syslinux.cfg b/templates/boot/isolinux/syslinux.cfg
index 21ef563..4772423 100644
--- a/templates/boot/isolinux/syslinux.cfg
+++ b/templates/boot/isolinux/syslinux.cfg
@@ -1,7 +1,6 @@
 # use this to control the bootup via a serial port
 # SERIAL 0 9600
 DEFAULT grml
-APPEND lang=us apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce
 # DEFAULT menu.c32
 TIMEOUT 300
 # ONTIMEOUT chain.32 hd0 0
@@ -24,107 +23,113 @@ F10 f10
 
 MENU TITLE grml - Boot Menu
 
+# the default:
 LABEL grml
 MENU LABEL grml - Standard Bootup
 MENU DEFAULT
 KERNEL linux26
-APPEND lang=us apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce
-# APPEND lang=us apm=power-off vga=791 live-media-path=/GRML quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce
 
-LABEL old
-MENU LABEL old
+LABEL grml2ram
+MENU LABEL grml2ram - Copy Squashfs file to RAM
+MENU DEFAULT
 KERNEL linux26
-APPEND ramdisk_size=100000 init=/etc/init lang=us apm=power-off vga=791 nomce quiet grml_dir="live" grml_name="grml.squashfs"
+APPEND apm=power-off toram=%GRML_NAME_SQUASHFS% vga=791 quiet initrd=initrd.gz boot=live nomce
 
 LABEL splash
 MENU LABEL grml - Bootsplash
 KERNEL linux26
-APPEND lang=us apm=power-off vga=791 quiet initrd=initrd.gz boot=live splash nomce
+APPEND apm=power-off vga=791 quiet initrd=initrd.gz boot=live splash nomce
 
 LABEL grml2hd
 MENU LABEL grml2hd
 KERNEL linux26
-APPEND lang=us apm=power-off quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off quiet initrd=initrd.gz boot=live nomce
+
+LABEL debian2hd
+MENU LABEL debian2hd
+KERNEL linux26
+APPEND apm=power-off vga=791 initrd=initrd.gz boot=live BOOT_IMAGE=debian2hd nomce
 
 LABEL debug
 MENU LABEL debug
 KERNEL linux26
-APPEND lang=us apm=power-off vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce
+APPEND apm=power-off vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce
 
 LABEL bootchart
 MENU LABEL bootchart
 KERNEL linux26
-APPEND init=/sbin/bootchartd lang=us apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce
+APPEND init=/sbin/bootchartd apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce
 
 LABEL vmware
 MENU LABEL vmware
 KERNEL linux26
-APPEND lang=us apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce
 
 LABEL qemu
 MENU LABEL qemu
 KERNEL linux26
-APPEND lang=us apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce qemu
+APPEND apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce qemu
 
 LABEL grmlx
 MENU LABEL grmlx
 KERNEL linux26
-APPEND lang=us apm=power-off startx=wm-ng vga=791 quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off startx=wm-ng vga=791 quiet initrd=initrd.gz boot=live nomce
 
 LABEL nofb
 MENU LABEL grml without framebuffer
 KERNEL linux26
-APPEND lang=us apm=power-off vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce
 
 LABEL linux26
 MENU LABEL linux26
 KERNEL linux26
-APPEND lang=us apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce
 
 LABEL memtest
 MENU LABEL memtest
-KERNEL memtest
+KERNEL /boot/addons/memtest
 APPEND BOOT_IMAGE=memtest
 
 LABEL fb1280x1024
 MENU LABEL fb1280x1024
 KERNEL linux26
-APPEND lang=us apm=power-off vga=794 quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off vga=794 quiet initrd=initrd.gz boot=live nomce
 
 LABEL fb1024x768
 MENU LABEL fb1024x768
 KERNEL linux26
-APPEND lang=us apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce
 
 LABEL fb800x600
 MENU LABEL fb800x600
 KERNEL linux26
-APPEND lang=us apm=power-off vga=788 quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off vga=788 quiet initrd=initrd.gz boot=live nomce
 
 LABEL failsafe
 MENU LABEL failsafe
 KERNEL linux26
-APPEND initrd=initrd.gz vga=normal lang=us boot=live noautoconfig atapicd noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia maxcpus=1 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm
+APPEND initrd=initrd.gz vga=normal boot=live noautoconfig atapicd noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia maxcpus=1 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm
 
 LABEL forensic
 MENU LABEL forensic
 KERNEL linux26
-APPEND vga=791 lang=us nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live
+APPEND vga=791 forensic nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live
 
 LABEL grub
 MENU LABEL grub
-KERNEL memdisk
-APPEND initrd=allinone.img
+KERNEL /boot/addons/memdisk
+APPEND initrd=/boot/addons/allinone.img
 
 LABEL dos
 MENU LABEL dos
-KERNEL memdisk
-APPEND initrd=balder10.imz
+KERNEL /boot/addons/memdisk
+APPEND initrd=/boot/addons/balder10.imz
 
 LABEL serial
 MENU LABEL serial
 KERNEL linux26
-APPEND lang=us apm=power-off vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce console=tty1 console=ttyS0,9600n8
 
 LABEL userdef
 MENU LABEL User defined