Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2022-06-18 08:38:29 +0300
committernl6720 <nl6720@gmail.com>2022-06-18 08:38:29 +0300
commit2a8fc3bbc0e884eefbe8522ab5f66fbb704e3c25 (patch)
treeeb253cdcf22f640f31cf41f5d463e20a9dd79480 /configs
parentde151089cec6881a8c6c9a27ba095b1fb1637845 (diff)
parent39fddfa51b30769a5ff34e51fe2eedd19a81409a (diff)
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')
-rw-r--r--configs/baseline/grub/grub.cfg2
-rw-r--r--configs/baseline/profiledef.sh4
-rw-r--r--configs/releng/grub/grub.cfg34
-rw-r--r--configs/releng/profiledef.sh4
4 files changed, 34 insertions, 10 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/baseline/profiledef.sh b/configs/baseline/profiledef.sh
index 34060f2..93002d4 100644
--- a/configs/baseline/profiledef.sh
+++ b/configs/baseline/profiledef.sh
@@ -9,8 +9,8 @@ iso_version="$(date +%Y.%m.%d)"
install_dir="arch"
buildmodes=('iso')
bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito'
- 'uefi-ia32.grub.esp' 'uefi-x64.systemd-boot.esp'
- 'uefi-ia32.grub.eltorito' 'uefi-x64.systemd-boot.eltorito')
+ 'uefi-ia32.grub.esp' 'uefi-x64.grub.esp'
+ 'uefi-ia32.grub.eltorito' 'uefi-x64.grub.eltorito')
arch="x86_64"
pacman_conf="pacman.conf"
airootfs_image_type="erofs"
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
diff --git a/configs/releng/profiledef.sh b/configs/releng/profiledef.sh
index f3bbe11..4b4e68c 100644
--- a/configs/releng/profiledef.sh
+++ b/configs/releng/profiledef.sh
@@ -9,8 +9,8 @@ iso_version="$(date +%Y.%m.%d)"
install_dir="arch"
buildmodes=('iso')
bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito'
- 'uefi-ia32.grub.esp' 'uefi-x64.systemd-boot.esp'
- 'uefi-ia32.grub.eltorito' 'uefi-x64.systemd-boot.eltorito')
+ 'uefi-ia32.grub.esp' 'uefi-x64.grub.esp'
+ 'uefi-ia32.grub.eltorito' 'uefi-x64.grub.eltorito')
arch="x86_64"
pacman_conf="pacman.conf"
airootfs_image_type="squashfs"