Don't hardcode wm-ng as window manager for X

[grml-live.git] / templates / boot / isolinux / hidden.cfg

diff --git a/templates/boot/isolinux/hidden.cfg b/templates/boot/isolinux/hidden.cfg
index e00b45d..15b5e2e 100644 (file)
--- a/templates/boot/isolinux/hidden.cfg
+++ b/templates/boot/isolinux/hidden.cfg
@@ -3,11 +3,6 @@ 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 
-
 label debian2hd
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
@@ -26,12 +21,17 @@ append init=/sbin/bootchartd apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAM
 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 
+append apm=power-off startx vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce 
 
 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 
+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 nokms
+menu hide
+kernel /boot/%SHORT_NAME%/linux26
+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