sync with archiso v49v49

Imported changes:
cc169d7 (HEAD -> master, origin/master, origin/HEAD) configs/releng/packages.x86_64: add fatresize, gpart and tmux
40ae3ba (tag: v49) Set syslinux bootloader timeout to 15s
ee6c5fa Set bootloader timeouts to 15s
9f16862 Configure the image type and image creation options using profiles (#54)
e369ade fix a typo, add myself in AUTHORS.rst
e748a77 Add accessibility support based on option flag
8bb3e8c Fix linter errors in livecd-sound
6a39300 implement accessibility support in archiso
6820f2c Add modconf to HOOKS array in mkinitcpio.conf
3caa30f configs/releng/packages.x86_64: add squashfs-tools and udftools
1bd944e Remove build.sh support from profiles and mkarchiso
bff3676 (origin/issues/38) Add documentation about how to create profiles

Extra changes:
* remove talkingparabola profile, it's no longer required

TODO:
* add braille support in OpenRC profiles

Signed-off-by: David P <megver83@parabola.nu>

1 files changed, 15 insertions, 5 deletions

diff --git a/scripts/run_parabolaiso.sh b/scripts/run_parabolaiso.sh
index 4c2c42a..b3063a5 100755
--- a/scripts/run_parabolaiso.sh
+++ b/scripts/run_parabolaiso.sh
@@ -21,6 +21,7 @@ Usage:
     run_parabolaiso [options]
 
 Options:
+    -a              set accessibility support using brltty
     -b              set boot type to 'BIOS' (default)
     -d              set image type to hard disk instead of optical disc
     -h              print help
@@ -76,6 +77,13 @@ run_image() {
         )
     fi
 
+    if [[ "${accessibility}" == 'on' ]]; then
+        qemu_options+=(
+            '-chardev' 'braille,id=brltty'
+            '-device' 'usb-braille,id=usbbrl,chardev=brltty'
+        )
+    fi
+
     qemu-system-x86_64 \
         -boot order=d,menu=on,reboot-timeout=5000 \
         -m "size=3072,slots=0,maxmem=$((3072*1024*1024))" \
@@ -87,17 +95,15 @@ run_image() {
         -display sdl \
         -vga virtio \
         -audiodev pa,id=snd0 \
-        -chardev braille,id=brltty \
         -device ich9-intel-hda \
         -device hda-output,audiodev=snd0 \
         -device virtio-net-pci,romfile=,netdev=net0 -netdev user,id=net0 \
-        -device usb-braille,id=usbbrl,chardev=brltty \
         -machine type=q35,smm=on,accel=kvm,usb=on,pcspk-audiodev=snd0 \
         -global ICH9-LPC.disable_s3=1 \
         -enable-kvm \
         "${qemu_options[@]}" \
-        -no-reboot \
-        -serial stdio
+        -serial stdio \
+        -no-reboot
 }
 
 set_image() {
@@ -113,6 +119,7 @@ set_image() {
 }
 
 image=''
+accessibility=''
 boot_type='bios'
 mediatype='cdrom'
 secure_boot='off'
@@ -121,8 +128,11 @@ working_dir="$(mktemp -dt run_parabolaiso.XXXXXXXXXX)"
 trap cleanup_working_dir EXIT
 
 if (( ${#@} > 0 )); then
-    while getopts 'bdhi:su' flag; do
+    while getopts 'abdhi:su' flag; do
         case "$flag" in
+            a)
+                accessibility='on'
+                ;;
             b)
                 boot_type='bios'
                 ;;