Drop wrongly merged failsafe bootoptions.

diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg
index e0ee186..97895ed 100644 (file)
--- a/templates/boot/isolinux/grml.cfg
+++ b/templates/boot/isolinux/grml.cfg
@@ -39,7 +39,7 @@ label ssh
 label failsafe
   menu label %GRML_NAME% - ^Failsafe Mode
   kernel /boot/%SHORT_NAME%/linux26
 label failsafe
   menu label %GRML_NAME% - ^Failsafe Mode
   kernel /boot/%SHORT_NAME%/linux26

-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% logo.nologo=1 distri=grml-forensic readonly apm=power-off nomce vga=normal noautoconfig noapic noacpi acpi=off noudev noapm agp=off nosmp maxcpus=0 libata.dma=0 nofstab nomodules nosound nogpm nosyslog nocpu nodisc nomodem xmodule=vesa noresume selinux=0 edd=off pci=nomsi noraid nolvm noswap raid=noautodetect nodhcp 
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off nomce vga=normal noautoconfig noapic noacpi acpi=off noudev noapm agp=off nosmp maxcpus=0 libata.dma=0 nofstab nomodules nosound nogpm nosyslog nocpu nodisc nomodem xmodule=vesa noresume selinux=0 edd=off pci=nomsi noraid nolvm noswap raid=noautodetect nodhcp 

   text help
                                         Boot Grml in failsafe mode, which
                                         disables any hardware recognition
   text help
                                         Boot Grml in failsafe mode, which
                                         disables any hardware recognition