X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=templates%2Fboot%2Fisolinux%2Fisolinux.cfg;h=74f3c12855e97e4f1a0532bdf6e248131c7797d6;hp=b3597a229a2f34035a2d3e7ef813ca4d2e3ad1f1;hb=ec6b52311380dd2b62058d9a807946fcb3d97cba;hpb=3381059aad9fe291dd72a39377397c4437d6ee64

diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg
index b3597a2..74f3c12 100644
--- a/templates/boot/isolinux/isolinux.cfg
+++ b/templates/boot/isolinux/isolinux.cfg
@@ -1,7 +1,7 @@
 # use this to control the bootup via a serial port
 # SERIAL 0 9600
 DEFAULT grml
-APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce
+APPEND apm=power-off lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
 # DEFAULT menu.c32
 TIMEOUT 300
 # ONTIMEOUT chain.32 hd0 0
@@ -27,118 +27,123 @@ MENU TITLE grml - Boot Menu
 LABEL grml
 MENU LABEL grml - Standard Bootup
 MENU DEFAULT
-KERNEL linux26
-APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce
-# APPEND apm=power-off lang=us vga=791 live-media-path=/GRML quiet initrd=initrd.gz boot=live nomce
+KERNEL /boot/%GRML_NAME%/linux26
+APPEND apm=power-off lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
 
-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"
+LABEL grml2ram
+MENU LABEL grml2ram - Copy Squashfs file to RAM
+MENU DEFAULT
+KERNEL /boot/%GRML_NAME%/linux26
+APPEND apm=power-off toram=grml.squashfs lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
 
 LABEL splash
 MENU LABEL grml - Bootsplash
-KERNEL linux26
-APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live splash nomce
+KERNEL /boot/%GRML_NAME%/linux26
+APPEND apm=power-off lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live splash nomce
 
 LABEL grml2hd
 MENU LABEL grml2hd
-KERNEL linux26
-APPEND apm=power-off lang=us quiet initrd=initrd.gz boot=live nomce
+KERNEL /boot/%GRML_NAME%/linux26
+APPEND apm=power-off lang=us quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
+
+LABEL debian2hd
+MENU LABEL debian2hd
+KERNEL /boot/%GRML_NAME%/linux26
+APPEND apm=power-off lang=us vga=791 initrd=/boot/%GRML_NAME%/initrd.gz boot=live BOOT_IMAGE=debian2hd nomce
 
 LABEL debug
 MENU LABEL debug
-KERNEL linux26
-APPEND apm=power-off lang=us vga=791 verbose debug=vc debug initrd=initrd.gz boot=live initcall_debug nomce
+KERNEL /boot/%GRML_NAME%/linux26
+APPEND apm=power-off lang=us vga=791 verbose debug=vc debug initrd=/boot/%GRML_NAME%/initrd.gz boot=live initcall_debug nomce
 
 LABEL bootchart
 MENU LABEL bootchart
-KERNEL linux26
-APPEND init=/sbin/bootchartd apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce
+KERNEL /boot/%GRML_NAME%/linux26
+APPEND init=/sbin/bootchartd apm=power-off lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
 
 LABEL vmware
 MENU LABEL vmware
-KERNEL linux26
-APPEND apm=power-off lang=us nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce
+KERNEL /boot/%GRML_NAME%/linux26
+APPEND apm=power-off lang=us nousb nousb2 nofirewire vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
 
 LABEL qemu
 MENU LABEL qemu
-KERNEL linux26
-APPEND apm=power-off lang=us nousb nousb2 nofirewire vga=791 quiet initrd=initrd.gz boot=live nomce qemu
+KERNEL /boot/%GRML_NAME%/linux26
+APPEND apm=power-off lang=us nousb nousb2 nofirewire vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce qemu
 
 LABEL grmlx
 MENU LABEL grmlx
-KERNEL linux26
-APPEND apm=power-off lang=us startx=wm-ng vga=791 quiet initrd=initrd.gz boot=live nomce
+KERNEL /boot/%GRML_NAME%/linux26
+APPEND apm=power-off lang=us startx=wm-ng vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
 
 LABEL nofb
 MENU LABEL grml without framebuffer
-KERNEL linux26
-APPEND apm=power-off lang=us vga=normal video=ofonly quiet initrd=initrd.gz boot=live nomce
+KERNEL /boot/%GRML_NAME%/linux26
+APPEND apm=power-off lang=us vga=normal video=ofonly quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
 
 LABEL linux26
 MENU LABEL linux26
-KERNEL linux26
-APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce
+KERNEL /boot/%GRML_NAME%/linux26
+APPEND apm=power-off lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/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 apm=power-off lang=us vga=794 quiet initrd=initrd.gz boot=live nomce
+KERNEL /boot/%GRML_NAME%/linux26
+APPEND apm=power-off lang=us vga=794 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
 
 LABEL fb1024x768
 MENU LABEL fb1024x768
-KERNEL linux26
-APPEND apm=power-off lang=us vga=791 quiet initrd=initrd.gz boot=live nomce
+KERNEL /boot/%GRML_NAME%/linux26
+APPEND apm=power-off lang=us vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce
 
 LABEL fb800x600
 MENU LABEL fb800x600
-KERNEL linux26
-APPEND apm=power-off lang=us vga=788 quiet initrd=initrd.gz boot=live nomce
+KERNEL /boot/%GRML_NAME%/linux26
+APPEND apm=power-off lang=us vga=788 quiet initrd=/boot/%GRML_NAME%/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
+KERNEL /boot/%GRML_NAME%/linux26
+APPEND initrd=/boot/%GRML_NAME%/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
 
 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
+KERNEL /boot/%GRML_NAME%/linux26
+APPEND vga=791 lang=us nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=/boot/%GRML_NAME%/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 apm=power-off lang=us vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce
+KERNEL /boot/%GRML_NAME%/linux26
+APPEND apm=power-off lang=us vga=normal video=vesafb:off quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce console=tty1 console=ttyS0,9600n8
 
 LABEL userdef
 MENU LABEL User defined
 MENU HIDE
-KERNEL linux26
+KERNEL /boot/%GRML_NAME%/linux26
 APPEND ###############################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################
 LABEL hda
 MENU LABEL Boot First Harddrive (via chain.c32)
-KERNEL chain.c32
+KERNEL /boot/addons/chain.c32
 APPEND hd0 0
 
 LABEL fd0
 MENU LABEL Boot First Floppy Drive (via chain.c32)
-KERNEL chain.c32
+KERNEL /boot/addons/chain.c32
 APPEND fd0
 
 LABEL hd