diff options
| author | nl6720 <nl6720@gmail.com> | 2022-06-18 08:38:29 +0300 |
|---|---|---|
| committer | nl6720 <nl6720@gmail.com> | 2022-06-18 08:38:29 +0300 |
| commit | 2a8fc3bbc0e884eefbe8522ab5f66fbb704e3c25 (patch) | |
| tree | eb253cdcf22f640f31cf41f5d463e20a9dd79480 /configs/releng/grub/grub.cfg | |
| parent | de151089cec6881a8c6c9a27ba095b1fb1637845 (diff) | |
| parent | 39fddfa51b30769a5ff34e51fe2eedd19a81409a (diff) | |
| download | archiso-2a8fc3bbc0e884eefbe8522ab5f66fbb704e3c25.tar.gz archiso-2a8fc3bbc0e884eefbe8522ab5f66fbb704e3c25.tar.bz2 | |
Merge remote-tracking branch 'origin/merge-requests/256'
After more than ten years, archiso is once again using GRUB. GRUB! Only this time, it's for UEFI not BIOS boot.
By plainlinen
* origin/merge-requests/256:
Update documentation for uefi x64 grub boot modes
Use grub for uefi x64 boot modes in profiledef.sh
Add *_uefi-x64.grub.* functions to mkarchiso
Add useful grub menu entries to grub.cfg
Closes #63 and #159
See merge request https://gitlab.archlinux.org/archlinux/archiso/-/merge_requests/256.
Diffstat (limited to 'configs/releng/grub/grub.cfg')
| -rw-r--r-- | configs/releng/grub/grub.cfg | 34 |
1 files changed, 29 insertions, 5 deletions
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 |