Skip to content

build-x86-images: include console screenreader #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
classabbyamp merged 3 commits into from
May 21, 2023
Merged

build-x86-images: include console screenreader #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e58bfde
build-x86-images: include console screenreader
classabbyamp Nov 17, 2022
d6a2ad0
dracut/vmklive: enable espeakup if live.screenreader is in kcl
classabbyamp Feb 20, 2023
af2fecf
installer.sh.in: remove espeakup from local install if not enabled
classabbyamp Feb 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build-x86-images.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ build_variant() {
IMG=void-live-${ARCH}-${DATE}-${variant}.iso
GRUB_PKGS="grub-i386-efi grub-x86_64-efi"
PKGS="dialog cryptsetup lvm2 mdadm void-docs-browse xtools-minimal xmirror $GRUB_PKGS"
PKGS="dialog cryptsetup lvm2 mdadm void-docs-browse xtools-minimal xmirror espeakup $GRUB_PKGS"
XORG_PKGS="xorg-minimal xorg-input-drivers xorg-video-drivers setxkbmap xauth font-misc-misc terminus-font dejavu-fonts-ttf alsa-plugins-pulseaudio"
SERVICES="sshd"

Expand Down
1 change: 1 addition & 0 deletions dracut/vmklive/module-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ install() {
inst_hook pre-pivot 02 "$moddir/display-manager-autologin.sh"
inst_hook pre-pivot 02 "$moddir/getty-serial.sh"
inst_hook pre-pivot 03 "$moddir/locale.sh"
inst_hook pre-pivot 04 "$moddir/screenreader.sh"
}
9 changes: 9 additions & 0 deletions dracut/vmklive/screenreader.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/sh -x
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh

type getargbool >/dev/null 2>&1 || . /lib/dracut-lib.sh

if getargbool 0 live.screenreader && [ -d "${NEWROOT}/etc/sv/espeakup" ]; then
ln -s /etc/sv/espeakup "${NEWROOT}/etc/runit/runsvdir/current/"
fi
7 changes: 6 additions & 1 deletion installer.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1324,7 +1324,12 @@ ${BOLD}Do you want to continue?${RESET}" 20 80 || return
chroot $TARGETDIR dracut --no-hostonly --add-drivers "ahci" --force >>$LOG 2>&1
INFOBOX "Removing temporary packages from target ..." 4 60
echo "Removing temporary packages from target ..." >$LOG
xbps-remove -r $TARGETDIR -Ry dialog xtools-minimal xmirror >>$LOG 2>&1
TO_REMOVE="dialog xtools-minimal"
# only remove espeakup if it wasn't enabled in the live environment
if ! [ -e "/var/service/espeakup" ]; then
TO_REMOVE+=" espeakup"
fi
xbps-remove -r $TARGETDIR -Ry $TO_REMOVE >>$LOG 2>&1
rmdir $TARGETDIR/mnt/target
else
# mount required fs
Expand Down