Provide nokms bootoption and according menues in the graphical bootmenu to disable...

[grml-live.git] / templates / boot / grub / grub.cfg

diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index 0cb37b1..5e99e37 100644 (file)
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -20,10 +20,6 @@ else
   set menu_color_highlight=black/yellow
 fi
 
-# make sure we can access partitions
-insmod part_msdos
-insmod part_gpt
-
 if [ ${iso_path} ] ; then
     set loopback="findiso=${iso_path}"
 fi
@@ -42,33 +38,49 @@ menuentry "GPXE - boot via network/PXE" {
     linux16 /boot/addons/gpxe.lkrn
 }
 
-menuentry "Grub - all in one image" {
-    linux   /boot/addons/memdisk
-    initrd  /boot/addons/allinone.img
+menuentry "GRUB - all in one image" {
+    linux16  /boot/addons/memdisk
+    initrd16 /boot/addons/allinone.img
 }
 
 menuentry "FreeDOS" {
-    linux   /boot/addons/memdisk
-    initrd  /boot/addons/balder10.imz
-}
-
-menuentry "MirOS bsd4grml (regular method)" {
-    multiboot   /boot/addons/bsd4grml/ldbsd.com
+    linux16  /boot/addons/memdisk
+    initrd16 /boot/addons/balder10.imz
 }
 
-menuentry "MirOS bsd4grml (fallback method)" {
-    multiboot   /boot/addons/bsd4grml/ldbsd.com
-    module      /boot/addons/bsd4grml/bsd.rd
-    module      /boot/addons/bsd4grml/boot.1
-    module      /boot/addons/bsd4grml/boot.2
-    module      /boot/addons/bsd4grml/boot.3
-    module      /boot/addons/bsd4grml/boot.4
-    module      /boot/addons/bsd4grml/boot.5
-    module      /boot/addons/bsd4grml/boot.6
-    module      /boot/addons/bsd4grml/boot.cfg
-    module      /boot/grub/%GRUB_LEGACY%
-    module      /boot/grub/core.img
-}
+if [ ${iso_path} ] ; then
+    # assume loopback.cfg boot
+    menuentry "MirOS bsd4grml (via loopback)" {
+        multiboot   /boot/addons/bsd4grml/ldbsd.com
+        module      /boot/addons/bsd4grml/bsd.rd bsd
+        module      /boot/addons/bsd4grml/loopback.0 boot.cfg
+        module      /boot/addons/bsd4grml/loopback.1 boot.1
+        module      /boot/addons/bsd4grml/loopback.2 boot.2
+        module      /boot/addons/bsd4grml/loopback.3 boot.3
+        module      /boot/addons/bsd4grml/loopback.4 boot.4
+        module      /boot/addons/bsd4grml/loopback.5 boot.5
+        module      /boot/addons/bsd4grml/loopback.6 boot.6
+    }
+else
+    # assume grub.cfg boot
+    menuentry "MirOS bsd4grml (regular method)" {
+        multiboot   /boot/addons/bsd4grml/ldbsd.com
+    }
+
+    menuentry "MirOS bsd4grml (fallback method)" {
+        multiboot   /boot/addons/bsd4grml/ldbsd.com
+        module      /boot/addons/bsd4grml/bsd.rd bsd.rd
+        module      /boot/addons/bsd4grml/boot.1 boot.1
+        module      /boot/addons/bsd4grml/boot.2 boot.2
+        module      /boot/addons/bsd4grml/boot.3 boot.3
+        module      /boot/addons/bsd4grml/boot.4 boot.4
+        module      /boot/addons/bsd4grml/boot.5 boot.5
+        module      /boot/addons/bsd4grml/boot.6 boot.6
+        module      /boot/addons/bsd4grml/boot.cfg boot.cfg
+        module      /boot/grub/%GRUB_LEGACY% %GRUB_LEGACY%
+        module      /boot/grub/core.img core.img
+    }
+fi
 
 menuentry "Boot OS of first partition on first disk" {
     set root=(hd0,1)
@@ -105,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