Adjust grml2ram in isolinux.cfg as well

[grml-live.git] / templates / boot / isolinux / syslinux.cfg

diff --git a/templates/boot/isolinux/syslinux.cfg b/templates/boot/isolinux/syslinux.cfg
index 976365d..947bd31 100644 (file)
--- a/templates/boot/isolinux/syslinux.cfg
+++ b/templates/boot/isolinux/syslinux.cfg
@@ -34,13 +34,7 @@ LABEL grml2ram
 MENU LABEL grml2ram - Copy Squashfs file to RAM
 MENU DEFAULT
 KERNEL linux26
-APPEND apm=power-off toram=grml.squashfs lang=us vga=791 quiet initrd=initrd.gz boot=live nomce
-
-# deprecated:
-LABEL old
-MENU LABEL old
-KERNEL linux26
-APPEND ramdisk_size=100000 init=/etc/init apm=power-off lang=us vga=791 nomce quiet grml_dir="live" grml_name="grml.squashfs"
+APPEND apm=power-off toram=%GRML_NAME_SQUASHFS% lang=us vga=791 quiet initrd=initrd.gz boot=live nomce
 
 LABEL splash
 MENU LABEL grml - Bootsplash
@@ -52,6 +46,11 @@ MENU LABEL grml2hd
 KERNEL linux26
 APPEND apm=power-off lang=us quiet initrd=initrd.gz boot=live nomce
 
+LABEL debian2hd
+MENU LABEL debian2hd
+KERNEL linux26
+APPEND apm=power-off lang=us vga=791 initrd=initrd.gz boot=live BOOT_IMAGE=debian2hd nomce
+
 LABEL debug
 MENU LABEL debug
 KERNEL linux26
@@ -89,7 +88,7 @@ APPEND apm=power-off lang=us 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
@@ -119,18 +118,18 @@ APPEND vga=791 lang=us nofstab noraid nolvm noautoconfig noswap raid=noautodetec
 
 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 apm=power-off lang=us vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce console=tty1 console=ttyS0,9600n8
 
 LABEL userdef
 MENU LABEL User defined