From f4df7b052074c426861a7d9fe0a51bb1105bd7c9 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 26 Oct 2009 09:39:29 +0100 Subject: [PATCH] Add 'noquick' to the serial bootoption --- debian/changelog | 3 ++- templates/boot/grub/grub.cfg | 2 +- templates/boot/grub/menu.lst | 2 +- templates/boot/isolinux/grml.cfg | 2 +- templates/boot/isolinux/hidden.cfg | 2 +- templates/boot/isolinux/syslinux.cfg | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 267772a..5a42c0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ grml-live (0.9.27) unstable; urgency=low * Adjust grub variable in boot/isolinux/{addons,grub}.cfg as well. * Add fio to GRML_FULL (thanks for the hint, Ulrich). + * Add 'noquick' to the serial bootoption. - -- Michael Prokop Mon, 26 Oct 2009 09:38:30 +0100 + -- Michael Prokop Mon, 26 Oct 2009 09:39:06 +0100 grml-live (0.9.26) unstable; urgency=low diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg index e9b9abd..c225511 100644 --- a/templates/boot/grub/grub.cfg +++ b/templates/boot/grub/grub.cfg @@ -100,7 +100,7 @@ menuentry "%GRML_NAME% - debug mode" { } menuentry "%GRML_NAME% - serial mode" { - linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live nomce quiet vga=normal video=vesafb:off console=tty1 console=ttyS0,9600n8 + linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live nomce quiet vga=normal video=vesafb:off noquick 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 9e413a4..5d3aece 100644 --- a/templates/boot/grub/menu.lst +++ b/templates/boot/grub/menu.lst @@ -52,7 +52,7 @@ kernel /boot/%SHORT_NAME%/linux26 vga=791 lang=us nofstab noraid nolvm noautocon initrd /boot/%SHORT_NAME%/initrd.gz title %GRML_NAME% %VERSION% - serial console mode -kernel /boot/%SHORT_NAME%/linux26 apm=power-off lang=us vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce console=tty1 console=ttyS0,9600n8 +kernel /boot/%SHORT_NAME%/linux26 apm=power-off lang=us vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce noquick 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 3788fca..e6db01d 100644 --- a/templates/boot/isolinux/grml.cfg +++ b/templates/boot/isolinux/grml.cfg @@ -99,7 +99,7 @@ label grml2ram label serial menu label %GRML_NAME% - Serial ^Console kernel /boot/%SHORT_NAME%/linux26 - append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=normal video=vesafb:off quiet nomce console=tty1 console=ttyS0,9600n8 + append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live apm=power-off vga=normal video=vesafb:off quiet nomce noquick console=tty1 console=ttyS0,9600n8 text help diff --git a/templates/boot/isolinux/hidden.cfg b/templates/boot/isolinux/hidden.cfg index 0359298..0fc0c7b 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 nomce console=tty1 console=ttyS0,9600n8 +append apm=power-off vga=normal video=vesafb:off quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live nomce noquick console=tty1 console=ttyS0,9600n8 label userdef menu hide diff --git a/templates/boot/isolinux/syslinux.cfg b/templates/boot/isolinux/syslinux.cfg index 977fbf9..a17bf8c 100644 --- a/templates/boot/isolinux/syslinux.cfg +++ b/templates/boot/isolinux/syslinux.cfg @@ -147,7 +147,7 @@ APPEND pciids=/boot/addons/pci.ids LABEL serial MENU LABEL serial KERNEL linux26 -APPEND apm=power-off vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce console=tty1 console=ttyS0,9600n8 +APPEND apm=power-off vga=normal video=vesafb:off quiet initrd=initrd.gz boot=live nomce noquick console=tty1 console=ttyS0,9600n8 LABEL userdef MENU LABEL User defined -- 2.1.4