From 74c1552c554a38871c6adadc78299b44f7af2f58 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Sat, 27 Feb 2010 15:32:27 +0100
Subject: [PATCH] Drop noquick bootoption from serial console boot entry.

---
 templates/boot/grub/grub.cfg       | 2 +-
 templates/boot/grub/menu.lst       | 2 +-
 templates/boot/isolinux/grml.cfg   | 2 +-
 templates/boot/isolinux/hidden.cfg | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index b3bf32c..1bf5c8e 100644
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -104,7 +104,7 @@ menuentry "%GRML_NAME% - debug mode" {
 }
 
 menuentry "%GRML_NAME% - serial mode" {
-    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce quiet vga=normal video=vesafb:off noquick console=tty1 console=ttyS0,9600n8 
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% bootfrom=removable nomce quiet vga=normal video=vesafb:off console=tty1 console=ttyS0,9600n8 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
diff --git a/templates/boot/grub/menu.lst b/templates/boot/grub/menu.lst
index dcceeb2..15f7aa8 100644
--- a/templates/boot/grub/menu.lst
+++ b/templates/boot/grub/menu.lst
@@ -52,7 +52,7 @@ kernel /boot/%SHORT_NAME%/linux26 vga=791 nofstab noraid nolvm noautoconfig nosw
 initrd /boot/%SHORT_NAME%/initrd.gz
 
 title %GRML_NAME% %VERSION% - serial console mode
-kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce noquick console=tty1 console=ttyS0,9600n8 
+kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce console=tty1 console=ttyS0,9600n8 
 initrd /boot/%SHORT_NAME%/initrd.gz
 
 title Run memtest86+
diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg
index af95f47..82ef3c7 100644
--- a/templates/boot/isolinux/grml.cfg
+++ b/templates/boot/isolinux/grml.cfg
@@ -110,7 +110,7 @@ label persistent
 label serial
   menu label %GRML_NAME% - Serial ^Console
   kernel /boot/%SHORT_NAME%/linux26
-  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable apm=power-off vga=normal video=vesafb:off quiet nomce noquick console=tty1 console=ttyS0,9600n8 
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable apm=power-off vga=normal video=vesafb:off quiet nomce console=tty1 console=ttyS0,9600n8 
 
 
   text help
diff --git a/templates/boot/isolinux/hidden.cfg b/templates/boot/isolinux/hidden.cfg
index 1775268..436d7eb 100644
--- a/templates/boot/isolinux/hidden.cfg
+++ b/templates/boot/isolinux/hidden.cfg
@@ -71,7 +71,7 @@ append apm=power-off vga=788 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live
 label serial
 menu hide
 kernel /boot/%SHORT_NAME%/linux26
-append apm=power-off vga=normal video=vesafb:off quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce noquick console=tty1 console=ttyS0,9600n8 
+append apm=power-off vga=normal video=vesafb:off quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% bootfrom=removable nomce console=tty1 console=ttyS0,9600n8 
 
 label userdef
 menu hide
-- 
2.1.4