X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=templates%2Fboot%2Fisolinux%2Fhidden.cfg;h=923f5b032bcd147b11c0bd575a3e751ff9004f17;hp=03592989f327f80288783b7fe07d2dbb39386b50;hb=7883c5f346dc470bdcae370c68a77de0dc385766;hpb=0c1ca8beff577b5ec5287db7703439eceebf380d

diff --git a/templates/boot/isolinux/hidden.cfg b/templates/boot/isolinux/hidden.cfg
index 0359298..923f5b0 100644
--- a/templates/boot/isolinux/hidden.cfg
+++ b/templates/boot/isolinux/hidden.cfg
@@ -1,52 +1,47 @@
 label splash
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live splash nomce 
+append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% splash nomce 
 
 label grml2hd
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live nomce 
+append apm=power-off quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce BOOT_IMAGE=grml2hd grml2hd
 
 label debian2hd
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.gz boot=live BOOT_IMAGE=debian2hd nomce 
+append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% BOOT_IMAGE=debian2hd nomce 
 
 label debug
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 verbose debug=vc debug initrd=/boot/%SHORT_NAME%/initrd.gz boot=live initcall_debug nomce 
+append apm=power-off vga=791 verbose debug=vc initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% initcall_debug nomce 
 
 label bootchart
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append init=/sbin/bootchartd apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live nomce 
+append init=/sbin/bootchartd apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
-label vmware
-menu hide
-kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live nomce 
-
-label qemu
+label grmlx
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live nomce qemu 
+append apm=power-off startx=wm-ng vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
-label grmlx
+label nofb
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off startx=wm-ng vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live nomce 
+append apm=power-off vga=normal video=ofonly quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset 
 
-label nofb
+label nokms
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=normal video=ofonly quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live nomce 
+append apm=power-off initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset quiet nomce vga=791 
 
 label linux26
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live nomce 
+append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
 label memtest
 menu hide
@@ -56,22 +51,22 @@ append BOOT_IMAGE=memtest
 label fb1280x1024
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=794 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live nomce 
+append apm=power-off vga=794 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
 label fb1024x768
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live nomce 
+append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
 label fb800x600
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=788 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live nomce 
+append apm=power-off vga=788 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
 label serial
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=normal video=vesafb:off quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live nomce console=tty1 console=ttyS0,9600n8 
+append apm=power-off vga=normal video=vesafb:off quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce console=tty1 console=ttyS0,9600n8 
 
 label userdef
 menu hide