From 3addfe43b2dd4b7971f1c976b9fda527f25d1514 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sat, 7 Mar 2009 01:11:55 +0100 Subject: [PATCH] Update 'failsafe' bootoption. --- debian/changelog | 4 +++- templates/boot/grub/menu.lst | 3 ++- templates/boot/isolinux/isolinux.cfg | 2 +- templates/boot/isolinux/syslinux.cfg | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 67eac48..8ae037e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ grml-live (0.9.12) UNRELEASED; urgency=low * GRML_FULL/GRML_FORENSIC: replace libewf with libewf1. + * Add noapic, noresume, selinux=0 and edd=off to 'failsafe' + bootoption and use maxcpus=0 instead of maxcpus=1. - -- Michael Prokop Thu, 05 Mar 2009 14:36:04 +0100 + -- Michael Prokop Sat, 07 Mar 2009 01:08:25 +0100 grml-live (0.9.11) unstable; urgency=low diff --git a/templates/boot/grub/menu.lst b/templates/boot/grub/menu.lst index d7ac453..319c8a3 100644 --- a/templates/boot/grub/menu.lst +++ b/templates/boot/grub/menu.lst @@ -28,7 +28,8 @@ kernel /boot/%GRML_NAME%/linux26 apm=power-off lang=us vga=788 quiet initrd=init initrd /boot/%GRML_NAME%/initrd.gz title %GRML_NAME% %VERSION% - failsafe boot -kernel /boot/%GRML_NAME%/linux26 vga=normal lang=us boot=live noautoconfig atapicd noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia maxcpus=1 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm +kernel /boot/%GRML_NAME%/linux26 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 + initrd /boot/%GRML_NAME%/initrd.gz title %GRML_NAME% %VERSION% - debug mode diff --git a/templates/boot/isolinux/isolinux.cfg b/templates/boot/isolinux/isolinux.cfg index 2cf7de4..2ed75b2 100644 --- a/templates/boot/isolinux/isolinux.cfg +++ b/templates/boot/isolinux/isolinux.cfg @@ -108,7 +108,7 @@ APPEND apm=power-off vga=788 quiet initrd=/boot/%GRML_NAME%/initrd.gz boot=live LABEL failsafe MENU LABEL failsafe KERNEL /boot/%GRML_NAME%/linux26 -APPEND initrd=/boot/%GRML_NAME%/initrd.gz vga=normal boot=live noautoconfig atapicd noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia maxcpus=1 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm +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 LABEL forensic MENU LABEL forensic diff --git a/templates/boot/isolinux/syslinux.cfg b/templates/boot/isolinux/syslinux.cfg index e760109..f084ce6 100644 --- a/templates/boot/isolinux/syslinux.cfg +++ b/templates/boot/isolinux/syslinux.cfg @@ -108,7 +108,7 @@ APPEND apm=power-off vga=788 quiet initrd=initrd.gz boot=live nomce LABEL failsafe MENU LABEL failsafe KERNEL linux26 -APPEND initrd=initrd.gz vga=normal boot=live noautoconfig atapicd noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia maxcpus=1 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm +APPEND initrd=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 LABEL forensic MENU LABEL forensic -- 2.1.4