sync with archiso f4e2d68

archiso:
f4e2d68 (HEAD -> master, origin/master, origin/HEAD) Merge remote-tracking branch 'origin/merge-requests/254'
2a1f44b fix boot menu entry sorting
3bacf05 add accessible copytoram entry
a7e3337 enable beeps in boot menu
376e928 Merge remote-tracking branch 'origin/merge-requests/216'
09d8885 Update CHANGELOG.
c335d5d Update baseline and releng profiledef.sh to support ia32 uefi mode.
4e20b30 Add GRUB configuration files to baseline and releng profiles.
2b7e1b4 Add support for GRUB ia32 UEFI in mkarchiso, update READMEs.
4936978 Merge remote-tracking branch 'origin/merge-requests/250'
a8f7762 bind-tools has been replaced with bind

8 files changed, 71 insertions, 14 deletions

diff --git a/configs/releng/efiboot/loader/entries/01-parabolaiso-x86_64-linux-libre.conf b/configs/releng/efiboot/loader/entries/01-parabolaiso-x86_64-linux-libre.conf
index 760ce9a..925962a 100644
--- a/configs/releng/efiboot/loader/entries/01-parabolaiso-x86_64-linux-libre.conf
+++ b/configs/releng/efiboot/loader/entries/01-parabolaiso-x86_64-linux-libre.conf
@@ -1,4 +1,5 @@
-title   Parabola GNU/Linux-libre install medium (x86_64, UEFI)
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre
-initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
-options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL%
+title    Parabola GNU/Linux-libre install medium (x86_64, UEFI)
+sort-key 01
+linux    /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre
+initrd   /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
+options  parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL%
diff --git a/configs/releng/efiboot/loader/entries/02-parabolaiso-x86_64-speech-linux-libre.conf b/configs/releng/efiboot/loader/entries/02-parabolaiso-x86_64-speech-linux-libre.conf
index 3ebef25..e2f3cbe 100644
--- a/configs/releng/efiboot/loader/entries/02-parabolaiso-x86_64-speech-linux-libre.conf
+++ b/configs/releng/efiboot/loader/entries/02-parabolaiso-x86_64-speech-linux-libre.conf
@@ -1,4 +1,5 @@
-title   Parabola GNU/Linux-libre install medium (x86_64, UEFI) with speech
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre
-initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
-options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% accessibility=on
+title    Parabola GNU/Linux-libre install medium (x86_64, UEFI) with speech
+sort-key 02
+linux    /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre
+initrd   /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
+options  parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% accessibility=on
diff --git a/configs/releng/efiboot/loader/entries/03-parabolaiso-x86_64-ram-linux-libre.conf b/configs/releng/efiboot/loader/entries/03-parabolaiso-x86_64-ram-linux-libre.conf
index 40fd971..ea54bc3 100644
--- a/configs/releng/efiboot/loader/entries/03-parabolaiso-x86_64-ram-linux-libre.conf
+++ b/configs/releng/efiboot/loader/entries/03-parabolaiso-x86_64-ram-linux-libre.conf
@@ -1,4 +1,5 @@
-title   Parabola GNU/Linux-libre install medium (x86_64, UEFI, Copy to RAM)
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre
-initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
-options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% copytoram
+title    Parabola GNU/Linux-libre install medium (x86_64, UEFI, Copy to RAM)
+sort-key 03
+linux    /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre
+initrd   /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
+options  parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% copytoram
diff --git a/configs/releng/efiboot/loader/entries/04-parabolaiso-x86_64-ram-speech-linux-libre.conf b/configs/releng/efiboot/loader/entries/04-parabolaiso-x86_64-ram-speech-linux-libre.conf
new file mode 100644
index 0000000..9a5b99b
--- /dev/null
+++ b/configs/releng/efiboot/loader/entries/04-parabolaiso-x86_64-ram-speech-linux-libre.conf
@@ -0,0 +1,5 @@
+title    Parabola GNU/Linux-libre install medium (x86_64, UEFI, Copy to RAM) with speech
+sort-key 04
+linux    /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-libre
+initrd   /%INSTALL_DIR%/boot/x86_64/initramfs-linux-libre.img
+options  parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% copytoram accessibility=on
diff --git a/configs/releng/efiboot/loader/loader.conf b/configs/releng/efiboot/loader/loader.conf
index 8a5b018..8e31f03 100644
--- a/configs/releng/efiboot/loader/loader.conf
+++ b/configs/releng/efiboot/loader/loader.conf
@@ -1,2 +1,3 @@
 timeout 15
 default 01-parabolaiso-x86_64-linux-libre.conf
+beep on
diff --git a/configs/releng/grub/grub.cfg b/configs/releng/grub/grub.cfg
new file mode 100644
index 0000000..80b0d72
--- /dev/null
+++ b/configs/releng/grub/grub.cfg
@@ -0,0 +1,46 @@
+insmod part_gpt
+insmod part_msdos
+insmod fat
+insmod iso9660
+
+insmod all_video
+
+insmod font
+
+if loadfont "${prefix}/fonts/unicode.pf2" ; then
+    insmod gfxterm
+    set gfxmode="auto"
+    terminal_input console
+    terminal_output gfxterm
+fi
+
+# 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
+
+menuentry "Parabola GNU/Linux-libre install medium (x86_64, UEFI)" {
+    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% 
+    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 {
+    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
+}
diff --git a/configs/releng/packages.both b/configs/releng/packages.both
index 968966c..aabb1e6 100644
--- a/configs/releng/packages.both
+++ b/configs/releng/packages.both
@@ -1,7 +1,7 @@
 alsa-utils
 arch-install-scripts
 base
-bind-tools
+bind
 brltty
 btrfs-progs
 cloud-init
diff --git a/configs/releng/profiledef.sh b/configs/releng/profiledef.sh
index 8ca837f..12df102 100644
--- a/configs/releng/profiledef.sh
+++ b/configs/releng/profiledef.sh
@@ -8,7 +8,9 @@ iso_application="Parabola GNU/Linux-libre Live/Rescue CD"
 iso_version="$(date +%Y.%m.%d)"
 install_dir="parabola"
 buildmodes=('iso')
-bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
+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')
 arch="dual"
 pacman_conf="pacman.conf"
 airootfs_image_type="squashfs"