Skip to content

Commit 4e1edcf

Browse files
committed
build-x86-images, dracut/vmklive, installer: add support for brltty
1 parent 9e03bb6 commit 4e1edcf

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

build-x86-images.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ build_variant() {
4141
shift
4242
IMG=void-live-${ARCH}-${DATE}-${variant}.iso
4343
GRUB_PKGS="grub-i386-efi grub-x86_64-efi"
44-
A11Y_PKGS="espeakup void-live-audio"
44+
A11Y_PKGS="espeakup void-live-audio brltty"
4545
PKGS="dialog cryptsetup lvm2 mdadm void-docs-browse xtools-minimal xmirror $A11Y_PKGS $GRUB_PKGS"
4646
XORG_PKGS="xorg-minimal xorg-input-drivers xorg-video-drivers setxkbmap xauth font-misc-misc terminus-font dejavu-fonts-ttf alsa-plugins-pulseaudio"
4747
SERVICES="sshd"

dracut/vmklive/accessibility.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

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

7-
if getargbool 0 live.accessibility && [ -d "${NEWROOT}/etc/sv/espeakup" ]; then
8-
ln -s /etc/sv/espeakup "${NEWROOT}/etc/runit/runsvdir/current/"
7+
if getargbool 0 live.accessibility; then
8+
[ -d "${NEWROOT}/etc/sv/espeakup" ] && ln -s "/etc/sv/espeakup" "${NEWROOT}/etc/runit/runsvdir/current/"
9+
[ -d "${NEWROOT}/etc/sv/brltty" ] && ln -s "/etc/sv/brltty" "${NEWROOT}/etc/runit/runsvdir/current/"
910
fi

installer.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1325,10 +1325,13 @@ ${BOLD}Do you want to continue?${RESET}" 20 80 || return
13251325
INFOBOX "Removing temporary packages from target ..." 4 60
13261326
echo "Removing temporary packages from target ..." >$LOG
13271327
TO_REMOVE="dialog xtools-minimal"
1328-
# only remove espeakup if it wasn't enabled in the live environment
1328+
# only remove espeakup and brltty if it wasn't enabled in the live environment
13291329
if ! [ -e "/var/service/espeakup" ]; then
13301330
TO_REMOVE+=" espeakup"
13311331
fi
1332+
if ! [ -e "/var/service/brltty" ]; then
1333+
TO_REMOVE+=" brltty"
1334+
fi
13321335
xbps-remove -r $TARGETDIR -Ry $TO_REMOVE >>$LOG 2>&1
13331336
rmdir $TARGETDIR/mnt/target
13341337
else

0 commit comments

Comments
 (0)