Kaynağa Gözat

build-x86-images, dracut/vmklive, installer: add support for brltty

classabbyamp 1 yıl önce
ebeveyn
işleme
4e1edcfb88
3 değiştirilmiş dosya ile 8 ekleme ve 4 silme
  1. 1 1
      build-x86-images.sh
  2. 3 2
      dracut/vmklive/accessibility.sh
  3. 4 1
      installer.sh

+ 1 - 1
build-x86-images.sh

@@ -41,7 +41,7 @@ build_variant() {
     shift
     IMG=void-live-${ARCH}-${DATE}-${variant}.iso
     GRUB_PKGS="grub-i386-efi grub-x86_64-efi"
-    A11Y_PKGS="espeakup void-live-audio"
+    A11Y_PKGS="espeakup void-live-audio brltty"
     PKGS="dialog cryptsetup lvm2 mdadm void-docs-browse xtools-minimal xmirror $A11Y_PKGS $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"

+ 3 - 2
dracut/vmklive/accessibility.sh

@@ -4,6 +4,7 @@
 
 type getargbool >/dev/null 2>&1 || . /lib/dracut-lib.sh
 
-if getargbool 0 live.accessibility && [ -d "${NEWROOT}/etc/sv/espeakup" ]; then
-	ln -s /etc/sv/espeakup "${NEWROOT}/etc/runit/runsvdir/current/"
+if getargbool 0 live.accessibility; then
+    [ -d "${NEWROOT}/etc/sv/espeakup" ] && ln -s "/etc/sv/espeakup" "${NEWROOT}/etc/runit/runsvdir/current/"
+    [ -d "${NEWROOT}/etc/sv/brltty" ] && ln -s "/etc/sv/brltty" "${NEWROOT}/etc/runit/runsvdir/current/"
 fi

+ 4 - 1
installer.sh

@@ -1325,10 +1325,13 @@ ${BOLD}Do you want to continue?${RESET}" 20 80 || return
         INFOBOX "Removing temporary packages from target ..." 4 60
         echo "Removing temporary packages from target ..." >$LOG
         TO_REMOVE="dialog xtools-minimal"
-        # only remove espeakup if it wasn't enabled in the live environment
+        # only remove espeakup and brltty if it wasn't enabled in the live environment
         if ! [ -e "/var/service/espeakup" ]; then
             TO_REMOVE+=" espeakup"
         fi
+        if ! [ -e "/var/service/brltty" ]; then
+            TO_REMOVE+=" brltty"
+        fi
         xbps-remove -r $TARGETDIR -Ry $TO_REMOVE >>$LOG 2>&1
         rmdir $TARGETDIR/mnt/target
     else