X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=templates%2Fboot%2Fisolinux%2Fhidden.cfg;h=e00b45d116ba7856d3194a6102827556103e05a2;hb=f5434b2ae856b01dfae435986294f25264d12d87;hp=30580e2bb32aa690aa932d1b1e60484a2999abb1;hpb=dc760eb4e7b47894368e6ca19e5d6267442aca91;p=grml-live.git

diff --git a/templates/boot/isolinux/hidden.cfg b/templates/boot/isolinux/hidden.cfg
index 30580e2..e00b45d 100644
--- a/templates/boot/isolinux/hidden.cfg
+++ b/templates/boot/isolinux/hidden.cfg
@@ -1,52 +1,42 @@
 label splash
 menu hide
-kernel /boot/%GRML_NAME%/linux26
-append apm=power-off vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live splash nomce 
+kernel /boot/%SHORT_NAME%/linux26
+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/%GRML_NAME%/linux26
-append apm=power-off quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce 
+kernel /boot/%SHORT_NAME%/linux26
+append apm=power-off quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
 label debian2hd
 menu hide
-kernel /boot/%GRML_NAME%/linux26
-append apm=power-off vga=791 initrd=/boot/%GRML_NAME%/initrd.gz boot=live BOOT_IMAGE=debian2hd nomce 
+kernel /boot/%SHORT_NAME%/linux26
+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/%GRML_NAME%/linux26
-append apm=power-off vga=791 verbose debug=vc debug initrd=/boot/%GRML_NAME%/initrd.gz boot=live initcall_debug nomce 
+kernel /boot/%SHORT_NAME%/linux26
+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/%GRML_NAME%/linux26
-append init=/sbin/bootchartd apm=power-off vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce 
-
-label vmware
-menu hide
-kernel /boot/%GRML_NAME%/linux26
-append apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce 
-
-label qemu
-menu hide
-kernel /boot/%GRML_NAME%/linux26
-append apm=power-off nousb nousb2 nofirewire vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce qemu 
+kernel /boot/%SHORT_NAME%/linux26
+append init=/sbin/bootchartd apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
 label grmlx
 menu hide
-kernel /boot/%GRML_NAME%/linux26
-append apm=power-off startx=wm-ng vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce 
+kernel /boot/%SHORT_NAME%/linux26
+append apm=power-off startx=wm-ng vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
 label nofb
 menu hide
-kernel /boot/%GRML_NAME%/linux26
-append apm=power-off vga=normal video=ofonly quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce 
+kernel /boot/%SHORT_NAME%/linux26
+append apm=power-off vga=normal video=ofonly quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
 label linux26
 menu hide
-kernel /boot/%GRML_NAME%/linux26
-append apm=power-off vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce 
+kernel /boot/%SHORT_NAME%/linux26
+append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
 label memtest
 menu hide
@@ -55,28 +45,28 @@ append BOOT_IMAGE=memtest
 
 label fb1280x1024
 menu hide
-kernel /boot/%GRML_NAME%/linux26
-append apm=power-off vga=794 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce 
+kernel /boot/%SHORT_NAME%/linux26
+append apm=power-off vga=794 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
 label fb1024x768
 menu hide
-kernel /boot/%GRML_NAME%/linux26
-append apm=power-off vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce 
+kernel /boot/%SHORT_NAME%/linux26
+append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
 label fb800x600
 menu hide
-kernel /boot/%GRML_NAME%/linux26
-append apm=power-off vga=788 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce 
+kernel /boot/%SHORT_NAME%/linux26
+append apm=power-off vga=788 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
 label serial
 menu hide
-kernel /boot/%GRML_NAME%/linux26
-append apm=power-off vga=normal video=vesafb:off quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce console=tty1 console=ttyS0,9600n8 
+kernel /boot/%SHORT_NAME%/linux26
+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
 menu hide
-kernel /boot/%GRML_NAME%/linux26
+kernel /boot/%SHORT_NAME%/linux26
 append ###############################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################
 
 label hda