X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=templates%2Fboot%2Fisolinux%2Fhidden.cfg;h=a7f073825113f976c636fe2ea2aa319a7c2bf894;hp=26a35c4a90425232abf3a956e7f80cb43c127295;hb=f6af226f5f720f8af3770ae8b5b054def2101612;hpb=829bcb9166e4ede590b4294106376af22314b739

diff --git a/templates/boot/isolinux/hidden.cfg b/templates/boot/isolinux/hidden.cfg
index 26a35c4..a7f0738 100644
--- a/templates/boot/isolinux/hidden.cfg
+++ b/templates/boot/isolinux/hidden.cfg
@@ -1,52 +1,37 @@
 label splash
 menu hide
-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/%SHORT_NAME%/linux26
-append apm=power-off quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
+kernel /boot/%SHORT_NAME%/vmlinuz
+append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% splash nomce net.ifnames=0 
 
 label debian2hd
 menu hide
-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 
+kernel /boot/%SHORT_NAME%/vmlinuz
+append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% BOOT_IMAGE=debian2hd nomce net.ifnames=0 
 
 label debug
 menu hide
-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/%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 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 bootid=%BOOTID% nomce 
-
-label qemu
-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 bootid=%BOOTID% nomce qemu 
+kernel /boot/%SHORT_NAME%/vmlinuz
+append apm=power-off vga=791 verbose debug=vc initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% initcall_debug nomce net.ifnames=0 
 
 label grmlx
 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 bootid=%BOOTID% nomce 
+kernel /boot/%SHORT_NAME%/vmlinuz
+append apm=power-off startx vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 
 
 label nofb
 menu hide
-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 
+kernel /boot/%SHORT_NAME%/vmlinuz
+append apm=power-off vga=normal video=ofonly initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 cirrus.modeset=0 mgag200.modeset=0 nomodeset 
+
+label nokms
+menu hide
+kernel /boot/%SHORT_NAME%/vmlinuz
+append apm=power-off initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 cirrus.modeset=0 mgag200.modeset=0 nomodeset nomce net.ifnames=0 vga=791 
 
-label linux26
+label vmlinuz
 menu hide
-kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
+kernel /boot/%SHORT_NAME%/vmlinuz
+append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 
 
 label memtest
 menu hide
@@ -55,28 +40,28 @@ 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 bootid=%BOOTID% nomce 
+kernel /boot/%SHORT_NAME%/vmlinuz
+append apm=power-off vga=794 initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 
 
 label fb1024x768
 menu hide
-kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
+kernel /boot/%SHORT_NAME%/vmlinuz
+append apm=power-off vga=791 initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 
 
 label fb800x600
 menu hide
-kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=788 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
+kernel /boot/%SHORT_NAME%/vmlinuz
+append apm=power-off vga=788 initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 
 
 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 bootid=%BOOTID% nomce console=tty1 console=ttyS0,9600n8 
+kernel /boot/%SHORT_NAME%/vmlinuz
+append apm=power-off vga=normal video=vesafb:off initrd=/boot/%SHORT_NAME%/initrd.img boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% nomce net.ifnames=0 console=tty1 console=ttyS0,9600n8 
 
 label userdef
 menu hide
 menu hide
-kernel /boot/%SHORT_NAME%/linux26
+kernel /boot/%SHORT_NAME%/vmlinuz
 append ###############################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################
 
 label hda