Drop qemu and vmware bootoptions as they are not necessary any longer.

diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt
index 034d3e0..1b8b4d4 100644 (file)
--- a/templates/GRML/grml-cheatcodes.txt
+++ b/templates/GRML/grml-cheatcodes.txt
@@ -25,8 +25,6 @@ grub                                Boot Grub bootloader (special all-in-one-ima
 dos                                 Boot FreeDOS
 bsd                                 Boot MirOS BSD
 hdt                                 Boot Hardware Detection Tool (from syslinux project)
-qemu                                Boot with special options for use in Qemu
-vmware                              Boot with special options for use in VMware
 
 Further documentation regarding the init process can be found at:
 * http://git.grml.org/?p=live-initramfs-grml.git;a=blob_plain;f=manpages/live-initramfs.en.7.txt;hb=HEAD

diff --git a/templates/boot/isolinux/hidden.cfg b/templates/boot/isolinux/hidden.cfg
index 26a35c4..e00b45d 100644 (file)
--- a/templates/boot/isolinux/hidden.cfg
+++ b/templates/boot/isolinux/hidden.cfg
@@ -23,16 +23,6 @@ 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 
-
 label grmlx
 menu hide
 kernel /boot/%SHORT_NAME%/linux26