Verified Commit c300a602 authored by Tallero Tallero's avatar Tallero Tallero
Browse files

little fix

parents fc373136 fda19075
Pipeline #21425 passed with stages
in 50 minutes and 41 seconds
...@@ -536,8 +536,17 @@ _make_bootmode_uefi-ia32.grub.esp() { ...@@ -536,8 +536,17 @@ _make_bootmode_uefi-ia32.grub.esp() {
s|%ARCH%|${arch}|g" \ s|%ARCH%|${arch}|g" \
"${profile}/grub/grub.cfg" > "${work_dir}/grub.cfg" "${profile}/grub/grub.cfg" > "${work_dir}/grub.cfg"
# shellcheck disable=SC2016 IFS='' read -r -d '' grubembedcfg <<'EOF' || true
printf 'configfile ${cmdpath}/grub.cfg\n' > "${work_dir}/grub-embed.cfg" if ! [ -d "$cmdpath" ]; then
# On some firmware, GRUB has a wrong cmdpath when booted from an optical disc.
# https://gitlab.archlinux.org/archlinux/archiso/-/issues/183
if regexp --set=1:isodevice '^(\([^)]+\))\/?[Ee][Ff][Ii]\/[Bb][Oo][Oo][Tt]\/?$' "$cmdpath"; then
cmdpath="${isodevice}/EFI/BOOT"
fi
fi
configfile "${cmdpath}/grub.cfg"
EOF
printf '%s\n' "$grubembedcfg" > "${work_dir}/grub-embed.cfg"
# Create EFI binary # Create EFI binary
grub-mkstandalone -O i386-efi \ grub-mkstandalone -O i386-efi \
...@@ -612,8 +621,17 @@ _make_bootmode_uefi-x64.grub.esp() { ...@@ -612,8 +621,17 @@ _make_bootmode_uefi-x64.grub.esp() {
s|%ARCH%|${arch}|g" \ s|%ARCH%|${arch}|g" \
"${profile}/grub/grub.cfg" > "${work_dir}/grub.cfg" "${profile}/grub/grub.cfg" > "${work_dir}/grub.cfg"
# shellcheck disable=SC2016 IFS='' read -r -d '' grubembedcfg <<'EOF' || true
printf 'configfile ${cmdpath}/grub.cfg\n' > "${work_dir}/grub-embed.cfg" if ! [ -d "$cmdpath" ]; then
# On some firmware, GRUB has a wrong cmdpath when booted from an optical disc.
# https://gitlab.archlinux.org/archlinux/archiso/-/issues/183
if regexp --set=1:isodevice '^(\([^)]+\))\/?[Ee][Ff][Ii]\/[Bb][Oo][Oo][Tt]\/?$' "$cmdpath"; then
cmdpath="${isodevice}/EFI/BOOT"
fi
fi
configfile "${cmdpath}/grub.cfg"
EOF
printf '%s\n' "$grubembedcfg" > "${work_dir}/grub-embed.cfg"
# Create EFI binary # Create EFI binary
grub-mkstandalone -O x86_64-efi \ grub-mkstandalone -O x86_64-efi \
......
...@@ -14,14 +14,18 @@ if loadfont "${prefix}/fonts/unicode.pf2" ; then ...@@ -14,14 +14,18 @@ if loadfont "${prefix}/fonts/unicode.pf2" ; then
terminal_output gfxterm terminal_output gfxterm
fi fi
menuentry "Arch Linux (x86_64, UEFI)" { default=archlinux
timeout=15
timeout_style=menu
menuentry "Arch Linux (x86_64, UEFI)" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' {
set gfxpayload=keep set gfxpayload=keep
search --no-floppy --set=root --label %ARCHISO_LABEL% 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 initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
} }
menuentry "Arch Linux (x86_64, UEFI) Copy to RAM" { menuentry "Arch Linux (x86_64, UEFI) Copy to RAM" --class arch --class gnu-linux --class gnu --class os --id 'archlinux-copy-to-ram' {
set gfxpayload=keep set gfxpayload=keep
search --no-floppy --set=root --label %ARCHISO_LABEL% search --no-floppy --set=root --label %ARCHISO_LABEL%
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram
......
...@@ -14,25 +14,22 @@ if loadfont "${prefix}/fonts/unicode.pf2" ; then ...@@ -14,25 +14,22 @@ if loadfont "${prefix}/fonts/unicode.pf2" ; then
terminal_output gfxterm terminal_output gfxterm
fi fi
default=archlinux
timeout=15
timeout_style=menu
# GRUB init tune for accessibility # GRUB init tune for accessibility
# #
# Morse translation table: play 600 988 1 1319 4
# "." is "500 1 300 1"
# "-" is "600 3 300 1"
# " " is "100 2"
# "/" is "100 5"
#
# Message: "s for blind"
play 1500 500 1 300 1 500 1 300 1 500 1 300 1 100 5 500 1 300 1 500 1 300 1 100 5 500 1 300 1 500 1 300 1 800 7 300 1 500 1 300 1 100 5 800 7 300 1 500 1 300 1 500 1 300 1 500 1 300 1 100 5 500 1 300 1 800 7 300 1 500 1 300 1 500 1 300 1 100 5 500 1 300 1 500 1 300 1 100 2 500 1 300 1 500 1 300 1 100 5 800 7 300 1 500 1 300 1 100 5 800 7 300 1 500 1 300 1 500 1 300 1
menuentry "Arch Linux install medium (x86_64, UEFI)" { menuentry "Arch Linux install medium (x86_64, UEFI)" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' {
set gfxpayload=keep set gfxpayload=keep
search --no-floppy --set=root --label %ARCHISO_LABEL% 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 initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
} }
menuentry "Arch Linux install medium with speakup screen reader (x86_64, UEFI)" --hotkey=s { menuentry "Arch Linux install medium with speakup screen reader (x86_64, UEFI)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'archlinux-accessibility' {
set gfxpayload=keep set gfxpayload=keep
search --no-floppy --set=root --label %ARCHISO_LABEL% search --no-floppy --set=root --label %ARCHISO_LABEL%
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on
...@@ -55,16 +52,16 @@ if [ "${grub_platform}" == "efi" ]; then ...@@ -55,16 +52,16 @@ if [ "${grub_platform}" == "efi" ]; then
fi fi
menuentry 'UEFI Firmware Settings' --id 'uefi-firmware' { menuentry 'UEFI Firmware Settings' --id 'uefi-firmware' {
fwsetup fwsetup
} }
fi fi
menuentry "System shutdown" { menuentry "System shutdown" --class shutdown --class poweroff {
echo "System shutting down..." echo "System shutting down..."
halt halt
} }
menuentry "System restart" { menuentry "System restart" --class reboot --class restart {
echo "System rebooting..." echo "System rebooting..."
reboot reboot
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment