X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=templates%2Fboot%2Fgrub%2Fgrub.cfg;h=05d7493a9a65d79ee0d8ce3a0603f76c98d61e37;hp=31545bd0042dd1e62ed9f83ae81b85565881969b;hb=b8a13e3f8afff62fe3d767264b83d4ccde4cf006;hpb=641c1ace68b52313653478ba4699ca46a1e84184

diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index 31545bd..05d7493 100644
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -26,7 +26,7 @@ fi
 
 menuentry "%GRML_NAME% - release %VERSION% (default)" {
     set gfxpayload=1024x768
-    linux   /boot/%SHORT_NAME%/linux26 apm=power-off quiet boot=live bootid=%BOOTID% "${loopback}" nomce 
+    linux   /boot/%SHORT_NAME%/linux26 apm=power-off quiet boot=live bootid=%BOOTID% "${loopback}" "${kernelopts}" nomce 
     initrd  /boot/%SHORT_NAME%/initrd.gz
 }
 
@@ -38,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
+    linux16  /boot/addons/memdisk
+    initrd16 /boot/addons/balder10.imz
 }
 
-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
-    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)
@@ -73,55 +89,61 @@ menuentry "Boot OS of first partition on first disk" {
 
 menuentry "%GRML_NAME% - enable persistent mode" {
     set gfxpayload=1024x768x16,1024x768
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" quiet persistent 
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet persistent=nofiles 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - copy Grml to RAM" {
     set gfxpayload=1024x768
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" quiet toram=%GRML_NAME%.squashfs 
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet toram=%GRML_NAME%.squashfs 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - copy whole medium to RAM" {
     set gfxpayload=1024x768
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" quiet toram 
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet toram 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - start X by default" {
     set gfxpayload=1024x768
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" quiet startx=wm-ng 
+    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet startx=wm-ng 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - disable framebuffer" {
     set gfxpayload=text
-    linux  /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" 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=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}" 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}" 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
 }
 
 menuentry "%GRML_NAME% - debug mode" {
     set gfxpayload=1024x768
-    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" initcall verbose debug=vc 
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" initcall verbose debug=vc 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }
 
 menuentry "%GRML_NAME% - serial mode" {
     set gfxpayload=text
-    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" quiet video=vesafb:off console=tty1 console=ttyS0,9600n8 
+    linux /boot/%SHORT_NAME%/linux26 apm=power-off boot=live bootid=%BOOTID% nomce "${loopback}" "${kernelopts}" quiet video=vesafb:off console=tty1 console=ttyS0,9600n8 
     initrd /boot/%SHORT_NAME%/initrd.gz
 }