From: Michael Prokop <mika@grml.org>
Date: Wed, 1 Dec 2010 22:50:30 +0000 (+0100)
Subject: Provide nokms bootoption and according menues in the graphical bootmenu to disable... 
X-Git-Tag: v0.15.1_0~341
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;ds=sidebyside;h=594972d1dabb25a7162309752e5a6e42380eeab8;p=grml-live-grml.git

Provide nokms bootoption and according menues in the graphical bootmenu to disable Kernel Mode-Setting.
---

diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index da9c6b4..5e99e37 100644
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -117,6 +117,12 @@ menuentry "%GRML_NAME% - disable framebuffer" {
     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
+    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 
diff --git a/templates/boot/isolinux/grml.cfg b/templates/boot/isolinux/grml.cfg
index edd2511..286d708 100644
--- a/templates/boot/isolinux/grml.cfg
+++ b/templates/boot/isolinux/grml.cfg
@@ -22,6 +22,16 @@ label nofb
                                         Boot Grml without framebuffer.
   endtext
 
+label nokms
+  menu label %GRML_NAME% - Disable ^Kernel Mode-Setting
+  kernel /boot/%SHORT_NAME%/linux26
+  append initrd=/boot/%SHORT_NAME%/initrd.gz boot=live bootid=%BOOTID% apm=power-off radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset quiet nomce 
+
+  text help
+                                        Boot Grml without KMS (Kernel
+                                        Mode Setting).
+  endtext
+
 label ssh
   menu label %GRML_NAME% - Enable ^SSH (with random password)
   kernel /boot/%SHORT_NAME%/linux26
diff --git a/templates/boot/isolinux/hidden.cfg b/templates/boot/isolinux/hidden.cfg
index e00b45d..139f69a 100644
--- a/templates/boot/isolinux/hidden.cfg
+++ b/templates/boot/isolinux/hidden.cfg
@@ -33,6 +33,11 @@ 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 
 
+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 
+
 label linux26
 menu hide
 kernel /boot/%SHORT_NAME%/linux26