From 7883c5f346dc470bdcae370c68a77de0dc385766 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Tue, 28 Dec 2010 20:18:41 +0100 Subject: [PATCH] templates/boot: set nodmraid and grml2hd accordingly, make sure "No KMS" and "nofb" are consistent accross bootloaders. --- templates/boot/grub/grub.cfg | 10 +++++----- templates/boot/grub/menu.lst | 14 +++++++++----- templates/boot/isolinux/grml.cfg | 4 ++-- templates/boot/isolinux/hidden.cfg | 6 +++--- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg index 5e99e37..da66d68 100644 --- a/templates/boot/grub/grub.cfg +++ b/templates/boot/grub/grub.cfg @@ -113,25 +113,25 @@ menuentry "%GRML_NAME% - start X by default" { menuentry "%GRML_NAME% - disable framebuffer" { set gfxpayload=text - linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quietvideo=ofonly + linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet video=ofonly radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset initrd /boot/%SHORT_NAME%/initrd.gz } menuentry "%GRML_NAME% - disable Kernel Mode-Setting" { - set gfxpayload=text - linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quietradeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset + set gfxpayload=1024x768 + linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset initrd /boot/%SHORT_NAME%/initrd.gz } menuentry "%GRML_NAME% - forensic mode" { set gfxpayload=1024x768 - linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" readonly quiet nofstab noraid nolvm noautoconfig noswap raid=noautodetect + linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" readonly quiet nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect initrd /boot/%SHORT_NAME%/initrd.gz } menuentry "%GRML_NAME% - failsafe mode" { set gfxpayload=text - linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet 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% nomce "${loopback}" "${kernelopts}" quiet 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 nodmraid nolvm noresume selinux=0 edd=off initrd /boot/%SHORT_NAME%/initrd.gz } diff --git a/templates/boot/grub/menu.lst b/templates/boot/grub/menu.lst index 0dfa232..0a71074 100644 --- a/templates/boot/grub/menu.lst +++ b/templates/boot/grub/menu.lst @@ -15,8 +15,12 @@ title %GRML_NAME% %VERSION% - Default boot (using 1024x768 framebuffer) kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live bootid=%BOOTID% nomce initrd /boot/%SHORT_NAME%/initrd.gz -title %GRML_NAME% %VERSION% - without framebuffer -kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=normal video=ofonly quiet initrd=initrd.gz boot=live bootid=%BOOTID% nomce +title %GRML_NAME% %VERSION% - disable framebuffer +kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=normal video=ofonly quiet initrd=initrd.gz boot=live bootid=%BOOTID% nomce radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset +initrd /boot/%SHORT_NAME%/initrd.gz + +title %GRML_NAME% %VERSION% - disable Kernel Mode Setting +kernel /boot/%SHORT_NAME%/linux26 apm=power-off quiet initrd=initrd.gz boot=live bootid=%BOOTID% nomce radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset vga=791 initrd /boot/%SHORT_NAME%/initrd.gz title %GRML_NAME% %VERSION% - with 1280x1024 framebuffer @@ -28,7 +32,7 @@ kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=788 quiet initrd=initrd.gz b initrd /boot/%SHORT_NAME%/initrd.gz title %GRML_NAME% %VERSION% - failsafe boot -kernel /boot/%SHORT_NAME%/linux26 vga=normal boot=live bootid=%BOOTID% 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 +kernel /boot/%SHORT_NAME%/linux26 vga=normal boot=live bootid=%BOOTID% 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 nodmraid nolvm noresume selinux=0 edd=off initrd /boot/%SHORT_NAME%/initrd.gz title %GRML_NAME% %VERSION% - debug mode @@ -44,11 +48,11 @@ kernel /boot/%SHORT_NAME%/linux26 toram apm=power-off vga=791 quiet boot=live bo initrd /boot/%SHORT_NAME%/initrd.gz title %GRML_NAME% %VERSION% - grml2hd - install grml to local harddisk [adjust it!] -kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live bootid=%BOOTID% nomce partition=/dev/ice1 mbr=/dev/ice +kernel /boot/%SHORT_NAME%/linux26 apm=power-off vga=791 quiet boot=live bootid=%BOOTID% nomce BOOT_IMAGE=grml2hd grml2hd partition=/dev/ice1 mbr=/dev/ice user=grml filesystem=ext3 initrd /boot/%SHORT_NAME%/initrd.gz title %GRML_NAME% %VERSION% - forensic mode -kernel /boot/%SHORT_NAME%/linux26 vga=791 nofstab noraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live bootid=%BOOTID% +kernel /boot/%SHORT_NAME%/linux26 vga=791 nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect quiet initrd=initrd.gz boot=live bootid=%BOOTID% initrd /boot/%SHORT_NAME%/initrd.gz title %GRML_NAME% %VERSION% - serial console mode diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg index 5bbcf53..f801d64 100644 --- a/templates/boot/isolinux/grml.cfg +++ b/templates/boot/isolinux/grml.cfg @@ -49,7 +49,7 @@ label ssh label failsafe menu label %GRML_NAME% - ^Failsafe Mode kernel /boot/%SHORT_NAME%/linux26 - append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off nomce vga=normal noautoconfig noapic noacpi acpi=off noudev noapm agp=off nosmp maxcpus=0 libata.dma=0 nofstab nomodules nosound nogpm nosyslog nocpu nodisc nomodem xmodule=vesa noresume selinux=0 edd=off pci=nomsi noraid nolvm noswap raid=noautodetect nodhcp + append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off nomce vga=normal noautoconfig noapic noacpi acpi=off noudev noapm agp=off nosmp maxcpus=0 libata.dma=0 nofstab nomodules nosound nogpm nosyslog nocpu nodisc nomodem xmodule=vesa noresume selinux=0 edd=off pci=nomsi noraid nodmraid nolvm noswap raid=noautodetect nodhcp text help Boot Grml in failsafe mode, which disables any hardware recognition @@ -61,7 +61,7 @@ label failsafe label forensic menu label %GRML_NAME% - F^orensic Mode kernel /boot/%SHORT_NAME%/linux26 - append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off nomce vga=791 forensic nofstab noraid nolvm noautoconfig noswap raid=noautodetect readonly quiet + append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off nomce vga=791 forensic nofstab noraid nodmraid nolvm noautoconfig noswap raid=noautodetect readonly quiet text help Boot Grml in forensic mode. This diff --git a/templates/boot/isolinux/hidden.cfg b/templates/boot/isolinux/hidden.cfg index 139f69a..923f5b0 100644 --- a/templates/boot/isolinux/hidden.cfg +++ b/templates/boot/isolinux/hidden.cfg @@ -6,7 +6,7 @@ append apm=power-off vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live label grml2hd menu hide kernel /boot/%SHORT_NAME%/linux26 -append apm=power-off quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce +append apm=power-off quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce BOOT_IMAGE=grml2hd grml2hd label debian2hd menu hide @@ -31,12 +31,12 @@ append apm=power-off startx=wm-ng vga=791 quiet initrd=/boot/%SHORT_NAME%/initrd label nofb menu hide kernel /boot/%SHORT_NAME%/linux26 -append apm=power-off vga=normal video=ofonly quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce +append apm=power-off vga=normal video=ofonly quiet initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% nomce radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset label nokms menu hide kernel /boot/%SHORT_NAME%/linux26 -append apm=power-off initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset quiet nomce +append apm=power-off initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset quiet nomce vga=791 label linux26 menu hide -- 2.1.4