From: Christian Hofstaedtler <ch@grml.org>
Date: Thu, 15 Dec 2011 10:18:44 +0000 (+0100)
Subject: Remove 'failsafe' boot option, which wasn't really failsafe
X-Git-Tag: v0.17.1~40
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=0b584ff03ff5bbefb8315819f1cfe219467516f7

Remove 'failsafe' boot option, which wasn't really failsafe
---

diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt
index babfbb6..360db5c 100644
--- a/templates/GRML/grml-cheatcodes.txt
+++ b/templates/GRML/grml-cheatcodes.txt
@@ -16,7 +16,6 @@ fb800x600                           Use fixed framebuffer graphics (3)
 nofb                                Disable framebuffer
 floppy                              Boot from floppydisk
 hd / hd1 / hd2 / hd3                Boot from (local) primary / secondary /... harddisk
-failsafe                            Boot with (almost) no HW-detection
 debug                               Get shells during process of booting for debugging
 bootchart                           Create chart of booting sequence in /var/log/bootchart.tgz
 forensic                            Do not touch any harddisks during hardware recognition
diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index c2fdff0..e208fe6 100644
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -128,12 +128,6 @@ menuentry "%GRML_NAME% - forensic mode" {
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
-menuentry "%GRML_NAME% - failsafe mode" {
-    set gfxpayload=text
-    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nodmraid nolvm noresume selinux=0 edd=off 
-    initrd /boot/%SHORT_NAME%/initrd.gz
-}
-
 menuentry "%GRML_NAME% - debug mode" {
     set gfxpayload=keep
     linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" initcall verbose debug=vc 
diff --git a/templates/boot/isolinux/f3 b/templates/boot/isolinux/f3
index acff31a..2d04de6 100644
--- a/templates/boot/isolinux/f3
+++ b/templates/boot/isolinux/f3
@@ -7,7 +7,6 @@
  fb1280x1024, fb1024x768 or fb800x600   use framebuffer mode (e.g. notebooks)  
  nofb                                                disable framebuffer mode  
  hd / hd1 / hd2 / hd3 / floppy       boot from (1st/2nd/..) harddisk / floppy  
- failsafe                                use (nearly) no hardware recognition  
  serial                                               activate serial console  
  forensic              do not touch any harddisks during hardware recognition  
  debug [ break=live-bottom ]    get interactive shells during startup process  
diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg
index b248048..4d1603a 100644
--- a/templates/boot/isolinux/grml.cfg
+++ b/templates/boot/isolinux/grml.cfg
@@ -46,18 +46,6 @@ label ssh
                                         line (for example: ssh=secret).
   endtext
 
-label failsafe
-  menu label %GRML_NAME% - ^Failsafe Mode
-  kernel /boot/%SHORT_NAME%/linux26
-  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 nodmraid nolvm noswap raid=noautodetect nodhcp 
-  text help
-                                        Boot Grml in failsafe mode, which
-                                        disables any hardware recognition
-                                        that might prevent your system from
-                                        booting. If Grml does not boot in
-                                        default mode try using this option.
-  endtext
-
 label forensic
   menu label %GRML_NAME% - F^orensic Mode
   kernel /boot/%SHORT_NAME%/linux26