X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=templates%2Fboot%2Fisolinux%2Fsyslinux.cfg;h=a17bf8c136a58d3e3621dfeeded326bb3dad6aa4;hp=664b863717e0688d3a31e1d72416728f75484cc2;hb=f4df7b052074c426861a7d9fe0a51bb1105bd7c9;hpb=dc760eb4e7b47894368e6ca19e5d6267442aca91

diff --git a/templates/boot/isolinux/syslinux.cfg b/templates/boot/isolinux/syslinux.cfg
index 664b863..a17bf8c 100644
--- a/templates/boot/isolinux/syslinux.cfg
+++ b/templates/boot/isolinux/syslinux.cfg
@@ -33,7 +33,7 @@ APPEND apm=power-off vga=791 quiet initrd=initrd.gz boot=live nomce
 LABEL grml2ram
 MENU LABEL grml2ram - Copy Squashfs file to RAM
 KERNEL linux26
-APPEND apm=power-off toram=%GRML_NAME_SQUASHFS% vga=791 quiet initrd=initrd.gz boot=live nomce 
+APPEND apm=power-off toram=%SQUASHFS_NAME% vga=791 quiet initrd=initrd.gz boot=live nomce 
 
 LABEL splash
 MENU LABEL grml - Bootsplash
@@ -115,8 +115,18 @@ MENU LABEL forensic
 KERNEL linux26
 APPEND vga=791 forensic nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live 
 
-LABEL grub
-MENU LABEL grub
+LABEL grub2
+MENU LABEL GRUB2
+KERNEL /boot/addons/bsd4grml/ldbsd.com
+APPEND echo Loading GRUB...`machine exec grub /boot/grub/core.img
+
+LABEL grub1
+MENU LABEL GRUB1
+KERNEL /boot/addons/bsd4grml/ldbsd.com
+APPEND echo Loading GRUB...`machine exec grub /boot/grub/%GRUB_LEGACY%
+
+LABEL allinone
+MENU LABEL All-in-One-Image
 KERNEL /boot/addons/memdisk
 APPEND initrd=/boot/addons/allinone.img
 
@@ -137,7 +147,7 @@ APPEND pciids=/boot/addons/pci.ids
 LABEL serial
 MENU LABEL serial
 KERNEL linux26
-APPEND apm=power-off vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce console=tty1 console=ttyS0,9600n8 
+APPEND apm=power-off vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce noquick console=tty1 console=ttyS0,9600n8 
 
 LABEL userdef
 MENU LABEL User defined