Add useful grub menu entries to grub.cfg

2 files changed, 30 insertions, 6 deletions

diff --git a/configs/baseline/grub/grub.cfg b/configs/baseline/grub/grub.cfg
index 0e5db49..5fc8d73 100644
--- a/configs/baseline/grub/grub.cfg
+++ b/configs/baseline/grub/grub.cfg
@@ -17,7 +17,7 @@ fi
 menuentry "Arch Linux (x86_64, UEFI)" {
     set gfxpayload=keep
     search --no-floppy --set=root --label %ARCHISO_LABEL%
-    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% 
+    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
     initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 }
 
diff --git a/configs/releng/grub/grub.cfg b/configs/releng/grub/grub.cfg
index 4a707b9..a85090d 100644
--- a/configs/releng/grub/grub.cfg
+++ b/configs/releng/grub/grub.cfg
@@ -28,7 +28,7 @@ play 500 500 1 300 1 500 1 300 1 500 1 300 1 100 5 500 1 300 1 500 1 300 1 100 2
 menuentry "Arch Linux install medium (x86_64, UEFI)" {
     set gfxpayload=keep
     search --no-floppy --set=root --label %ARCHISO_LABEL%
-    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% 
+    linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
     initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 }
 
@@ -39,8 +39,32 @@ menuentry "Arch Linux install medium with speakup screen reader (x86_64, UEFI)"
     initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 }
 
-menuentry "UEFI Shell" {
-	insmod chain
-        search --no-floppy --set=root --label %ARCHISO_LABEL%
-	chainloader /shellia32.efi
+if [ "${grub_platform}" == "efi" ]; then
+    if [ "${grub_cpu}" == "x86_64" ]; then
+        menuentry "UEFI Shell" {
+            insmod chain
+            search --no-floppy --set=root --label %ARCHISO_LABEL%
+            chainloader /shellx64.efi
+        }
+    elif [ "${grub_cpu}" == "i386" ]; then
+        menuentry "UEFI Shell" {
+            insmod chain
+            search --no-floppy --set=root --label %ARCHISO_LABEL%
+            chainloader /shellia32.efi
+        }
+    fi
+
+    menuentry 'UEFI Firmware Settings' --id 'uefi-firmware' {
+		fwsetup
+	}
+fi
+
+menuentry "System shutdown" {
+	echo "System shutting down..."
+	halt
 }
+
+menuentry "System restart" {
+	echo "System rebooting..."
+	reboot
+}
\ No newline at end of file