From acd732e1d19fc681f7971c170dd9ecf3335a9f19 Mon Sep 17 00:00:00 2001 From: David P Date: Sun, 26 Jun 2022 21:19:24 -0400 Subject: snyc with archiso fda1907 archiso: fda1907 (HEAD -> master, origin/master, origin/HEAD) mkarchiso: work arround GRUB's cmdpath having incorect case on some firmware e654106 configs/*/grub/grub.cfg: auto-boot after 15 seconds 9a98ae6 Merge remote-tracking branch 'origin/merge-requests/266' eaa2f8a change grub init tune 53a3ad2 mkarchiso: add SBAT metadata to grub-mkstandalone created EFI binaries 91b48f8 mkarchiso: improve comments b72523e configs/baseline/profiledef.sh: add `-E ztailpacking` to airootfs_image_tool_options for mkfs.erofs 052987b Merge remote-tracking branch 'origin/merge-requests/261' 2a8fc3b Merge remote-tracking branch 'origin/merge-requests/256' b8957f0 Add implicit package dependencies to PACKAGE_LIST in .gitlab-ci.yml 39fddfa Update documentation for uefi x64 grub boot modes e51b6f6 Use grub for uefi x64 boot modes in profiledef.sh 550b5be Add *_uefi-x64.grub.* functions to mkarchiso 98de411 Add useful grub menu entries to grub.cfg de15108 mkarchiso: use C.UTF-8 ba11c40 configs/: use the C.UTF-8 locale 89292ce .gitignore: ignore *.cer, *.crt, *.key, *.pem and *.img parabolaiso: * TODO: Since now GRUB for EFI is upstream, I want to make some testing for the OpenRC profiles and deprecate our downstream refind implementation Signed-off-by: David P --- configs/releng/airootfs/etc/locale.conf | 2 +- .../airootfs/etc/pacman.d/hooks/40-locale-gen.hook | 13 ------ configs/releng/grub/grub.cfg | 51 +++++++++++++++------- 3 files changed, 37 insertions(+), 29 deletions(-) delete mode 100644 configs/releng/airootfs/etc/pacman.d/hooks/40-locale-gen.hook (limited to 'configs/releng') diff --git a/configs/releng/airootfs/etc/locale.conf b/configs/releng/airootfs/etc/locale.conf index 01ec548..f9c983c 100644 --- a/configs/releng/airootfs/etc/locale.conf +++ b/configs/releng/airootfs/etc/locale.conf @@ -1 +1 @@ -LANG=en_US.UTF-8 +LANG=C.UTF-8 diff --git a/configs/releng/airootfs/etc/pacman.d/hooks/40-locale-gen.hook b/configs/releng/airootfs/etc/pacman.d/hooks/40-locale-gen.hook deleted file mode 100644 index 82dd199..0000000 --- a/configs/releng/airootfs/etc/pacman.d/hooks/40-locale-gen.hook +++ /dev/null @@ -1,13 +0,0 @@ -# remove from airootfs! -[Trigger] -Operation = Install -Type = Package -Target = glibc - -[Action] -Description = Uncommenting en_US.UTF-8 locale and running locale-gen... -When = PostTransaction -Depends = glibc -Depends = sed -Depends = sh -Exec = /bin/sh -c "sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen && locale-gen" diff --git a/configs/releng/grub/grub.cfg b/configs/releng/grub/grub.cfg index 80b0d72..d3ed9d2 100644 --- a/configs/releng/grub/grub.cfg +++ b/configs/releng/grub/grub.cfg @@ -14,33 +14,54 @@ if loadfont "${prefix}/fonts/unicode.pf2" ; then terminal_output gfxterm fi +default=parabola +timeout=15 +timeout_style=menu + # GRUB init tune for accessibility # -# Morse translation table: -# "." is "500 1 300 1" -# "-" is "600 3 300 1" -# " " is "100 2" -# "/" is "100 5" -# -# Message: "s for blind" -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 500 1 300 1 500 1 300 1 600 3 300 1 500 1 300 1 100 5 600 3 300 1 500 1 300 1 500 1 300 1 500 1 300 1 100 2 500 1 300 1 600 3 300 1 500 1 300 1 500 1 300 1 100 2 500 1 300 1 500 1 300 1 100 2 500 1 300 1 500 1 300 1 100 2 600 3 300 1 500 1 300 1 100 2 600 3 300 1 500 1 300 1 500 1 300 1 +play 600 988 1 1319 4 -menuentry "Parabola GNU/Linux-libre install medium (x86_64, UEFI)" { +menuentry "Parabola GNU/Linux-libre install medium (x86_64, UEFI)" --class arch --class gnu-linux --class gnu --class os --id 'parabola' { set gfxpayload=keep search --no-floppy --set=root --label %PARABOLAISO_LABEL% - linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img } -menuentry "Parabola GNU/Linux-libre install medium with speakup screen reader (x86_64, UEFI)" --hotkey=s { +menuentry "Parabola GNU/Linux-libre install medium with speakup screen reader (x86_64, UEFI)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'parabola-accessibility' { set gfxpayload=keep search --no-floppy --set=root --label %PARABOLAISO_LABEL% linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% accessibility=on initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img } -menuentry "UEFI Shell" { - insmod chain - search --no-floppy --set=root --label %PARABOLAISO_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 %PARABOLAISO_LABEL% + chainloader /shellx64.efi + } + elif [ "${grub_cpu}" == "i386" ]; then + menuentry "UEFI Shell" { + insmod chain + search --no-floppy --set=root --label %PARABOLAISO_LABEL% + chainloader /shellia32.efi + } + fi + + menuentry 'UEFI Firmware Settings' --id 'uefi-firmware' { + fwsetup + } +fi + +menuentry "System shutdown" --class shutdown --class poweroff { + echo "System shutting down..." + halt +} + +menuentry "System restart" --class reboot --class restart { + echo "System rebooting..." + reboot } -- cgit v1.2.2