From: Michael Prokop <mika@grml.org>
Date: Tue, 23 Feb 2010 12:44:53 +0000 (+0100)
Subject: Drop duplicate boot=live from grub.cfg.
X-Git-Tag: v0.9.36~8
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=ed3e22f8c13515a3e5890b1d034a897c96786ab3

Drop duplicate boot=live from grub.cfg.
---

diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index 24d7e2b..01e9705 100644
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -94,12 +94,12 @@ menuentry "%GRML_NAME% - forensic mode" {
 }
 
 menuentry "%GRML_NAME% - failsafe mode" {
-    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce quiet vga=normal boot=live 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 nolvm noresume selinux=0 edd=off 
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce quiet vga=normal 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 nolvm noresume selinux=0 edd=off 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - debug mode" {
-    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce vga=791 debug boot=live initcall_debug
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce vga=791 initcall_debug verbose debug=vc
     initrd /boot/%SHORT_NAME%/initrd.gz
 }