X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=templates%2Fboot%2Fgrub%2Faddons.cfg;h=e0a3d265b5b3920dc2a46561d01a4282d4f7fcd3;hb=e1a55042bafe00328b59bd9e080b443de7a40097;hp=86f117fb68442d65fd2430b0e77f733bda67bdb7;hpb=c959c1476ab7d229a30db25c2fe659fecab791ab;p=grml-live.git

diff --git a/templates/boot/grub/addons.cfg b/templates/boot/grub/addons.cfg
index 86f117f..e0a3d26 100644
--- a/templates/boot/grub/addons.cfg
+++ b/templates/boot/grub/addons.cfg
@@ -1,10 +1,56 @@
 submenu "Addons ->" --class=submenu {
 
+# EFI:
+if [ "${grub_platform}" == "efi" ] ; then
+  # arm64 doesn't provide the cpuid command, and we also
+  # don't have any memtest* efi files available, so only
+  # run on architectures other than arm64 (amd64 + i386)
+  if [ "${grub_cpu}" != "arm64" ] ; then
+    # try to detect amd64 by checking whether CPU supports 64-bit (long) mode
+    if cpuid -l ; then
+      if test -e /boot/addons/memtest86+x64.efi ; then
+        menuentry "Memory test (memtest86+x64.efi)" {
+          linuxefi /boot/addons/memtest86+x64.efi
+        }
+      fi
+    else # assume i386
+      if test -e /boot/addons/memtest86+x32.efi ; then
+        menuentry "Memory test (memtest86+x32.efi)" {
+          linuxefi /boot/addons/memtest86+x32.efi
+        }
+      fi
+    fi
+  fi
+fi
+
+# BIOS/non-EFI:
 if [ "${grub_platform}" != "efi" ] ; then
-    menuentry "Memory test (memtest86+)" {
+  # try to detect amd64 by checking whether CPU supports 64-bit (long) mode
+  if cpuid -l ; then
+    if test -e /boot/addons/memtest86+x64.bin ; then
+      menuentry "Memory test (memtest86+x64.bin)" {
+        insmod linux16
+        linux16 /boot/addons/memtest86+x64.bin
+      }
+    elif test -e /boot/addons/memtest ; then # fallback to old memtest
+      menuentry "Memory test (memtest86+)" {
         insmod linux16
         linux16 /boot/addons/memtest
-    }
+      }
+    fi
+  else  # assume i386
+    if test -e /boot/addons/memtest86+x32.bin ; then
+      menuentry "Memory test (memtest86+x32.bin)" {
+        insmod linux16
+        linux16 /boot/addons/memtest86+x32.bin
+      }
+    elif test -e /boot/addons/memtest ; then # fallback to old memtest
+      menuentry "Memory test (memtest86+)" {
+        insmod linux16
+        linux16 /boot/addons/memtest
+      }
+    fi
+  fi
 fi
 
 menuentry "iPXE - boot via network/PXE" {
@@ -78,7 +124,12 @@ if [ "${grub_platform}" != "efi" ] ; then
 fi # efi mode
 }
 
-menuentry "Boot OS of first partition on first disk" {
-    set root=(hd0,1)
-    chainloader +1
+if [ "${grub_platform}" == "efi" ] ; then
+menuentry "UEFI Firmware Settings" {
+    fwsetup
+}
+fi # efi mode
+
+menuentry "Boot from next device" {
+    exit
 }