From 89063b031e1d277a476cf9c37c887f55123bd93d Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 7 Sep 2009 14:41:32 +0200 Subject: [PATCH] templates/boot/isolinux/grml.cfg: add 'pci=nomsi' to failsafe bootoption; add space char at end of lines --- debian/changelog | 6 +++++- templates/boot/isolinux/grml.cfg | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2552fc5..beaafc2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,8 +32,12 @@ grml-live (0.9.22) UNRELEASED; urgency=low * Modify update-initramfs call in grml-live script as the 'update-initramfs -u -t' might fail with linux images which have been build using kernel-package. + * templates/boot/isolinux/grml.cfg: add space char at end of lines in entries + that are meant for manual editing (so user just has to press + and edit). + * Add 'pci=nomsi' to failsafe bootoption (thanks to Marc 'HE' Brockschmidt). - -- Michael Prokop Mon, 07 Sep 2009 14:26:14 +0200 + -- Michael Prokop Mon, 07 Sep 2009 14:40:41 +0200 grml-live (0.9.21) unstable; urgency=low diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg index e325b4f..cac2f0a 100644 --- a/templates/boot/isolinux/grml.cfg +++ b/templates/boot/isolinux/grml.cfg @@ -5,7 +5,7 @@ label grml menu DEFAULT menu label Grml ^Default Mode (%GRML_LONG_NAME% %VERSION%, %ARCH%) kernel /boot/%GRML_NAME%/linux26 - append apm=power-off vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce + append apm=power-off vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce text help Grml is a Debian based Linux live @@ -18,7 +18,7 @@ label grml label failsafe menu label Grml ^Failsafe Mode kernel /boot/%GRML_NAME%/linux26 - append initrd=/boot/%GRML_NAME%/initrd.gz 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 + append initrd=/boot/%GRML_NAME%/initrd.gz 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 pci=nomsi text help Boot Grml in failsafe mode, which @@ -31,7 +31,7 @@ label failsafe label forensic menu label Grml F^orensic Mode kernel /boot/%GRML_NAME%/linux26 - append initrd=/boot/%GRML_NAME%/initrd.gz vga=791 forensic nofstab noraid nolvm noautoconfig noswap raid=noautodetect readonly quiet boot=live + append initrd=/boot/%GRML_NAME%/initrd.gz vga=791 forensic nofstab noraid nolvm noautoconfig noswap raid=noautodetect readonly quiet boot=live text help Boot Grml in forensic mode. This mode @@ -43,7 +43,7 @@ label forensic label grml2ram menu label Grml to ^RAM kernel /boot/%GRML_NAME%/linux26 - append apm=power-off vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce toram=grml.squashfs + append apm=power-off vga=791 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live nomce toram=%GRML_NAME%.squashfs text help Load Grml into the memory (RAM). -- 2.1.4