Added brltty udev.rules so it hopefully works more reliably. A few other minor tweaks.

This commit is contained in:
Storm Dragon
2025-12-21 14:43:40 -05:00
parent acf8327949
commit 695b9e2f75
6 changed files with 833 additions and 36 deletions

View File

@@ -0,0 +1 @@
SUBSYSTEM=="tty", KERNEL=="tty[0-9]*|hvc[0-9]*|sclp_line[0-9]*|ttysclp[0-9]*|3270/tty[0-9]*", GROUP="tty", MODE="0620"

View File

@@ -822,28 +822,38 @@ install_base_system() {
log_info "Configuring pacman with Stormux repository"
log_info "Configuring package manager"
# Copy pacman.conf from live system
if [[ -f /etc/pacman.conf ]]; then
mkdir -p "$mountPoint/etc"
cp /etc/pacman.conf "$mountPoint/etc/pacman.conf"
local copyItems=(
"/etc/udev/rules.d/99-brltty.rules"
"/etc/pacman.conf"
"/usr/local/bin/sas"
"/usr/share/pacman/keyrings/stormux*"
"/etc/RHVoice/dicts/English"
)
local copyItem sourcePath destPath destDir nullglobWasSet=false
if shopt -q nullglob; then
nullglobWasSet=true
else
shopt -s nullglob
fi
# Copy Stormux Assistance Service (sas)
if [[ -f /usr/local/bin/sas ]]; then
mkdir -p "$mountPoint/usr/local/bin"
cp /usr/local/bin/sas "$mountPoint/usr/local/bin/sas"
fi
for copyItem in "${copyItems[@]}"; do
for sourcePath in $copyItem; do
if [[ -d "$sourcePath" ]]; then
destPath="$mountPoint$sourcePath"
mkdir -p "$destPath"
cp -a "$sourcePath/." "$destPath/"
elif [[ -e "$sourcePath" ]]; then
destPath="$mountPoint$sourcePath"
destDir="$(dirname "$destPath")"
mkdir -p "$destDir"
cp -a "$sourcePath" "$destPath"
fi
done
done
# Copy Stormux repo GPG key
if [[ -f /usr/share/pacman/keyrings/stormux.gpg ]]; then
mkdir -p "$mountPoint/usr/share/pacman/keyrings"
cp /usr/share/pacman/keyrings/stormux* "$mountPoint/usr/share/pacman/keyrings/"
fi
# Copy RHVoice English dict fixes from live system if present
if [[ -d /etc/RHVoice/dicts/English ]]; then
mkdir -p "$mountPoint/etc/RHVoice/dicts/English"
cp -a /etc/RHVoice/dicts/English/. "$mountPoint/etc/RHVoice/dicts/English/"
if ! $nullglobWasSet; then
shopt -u nullglob
fi
# Define package groups
@@ -883,23 +893,24 @@ install_base_system() {
local allPackages=("${basePackages[@]}" "${audioPackages[@]}" "${accessibilityPackages[@]}" "${utilityPackages[@]}")
# Add desktop-specific packages
case "$desktopEnvironment" in
i3)
allPackages+=(i3-wm orca python-psutil lxterminal pluma)
allPackages+=(discount jq libnotify xfce4-notifyd pamixer playerctl)
allPackages+=(python-i3ipc python-wxpython sox yad)
allPackages+=(lxsession magic-wormhole pcmanfm)
allPackages+=(python-gobject python-pillow python-pytesseract scrot tesseract)
allPackages+=(tesseract-data-eng udiskie xorg-setxkbmap xdotool)
# Add Stormux-specific i3 packages
stormuxPackages+=(xlibre-xserver xlibre-input-libinput nodm-dgw brave-bin)
;;
mate)
allPackages+=(mate mate-extra orca python-psutil)
# Add Stormux-specific MATE packages
stormuxPackages+=(xlibre-xserver xlibre-input-libinput nodm-dgw brave-bin)
;;
esac
if [[ "$hasDesktop" == true ]]; then
case "$desktopEnvironment" in
*)
allPackages+=(xlibre-xserver xlibre-input-libinput nodm-dgw brave-bin)
;;&
i3)
allPackages+=(i3-wm orca python-psutil lxterminal pluma)
allPackages+=(discount jq libnotify xfce4-notifyd pamixer playerctl)
allPackages+=(python-i3ipc python-wxpython sox yad)
allPackages+=(lxsession magic-wormhole pcmanfm)
allPackages+=(python-gobject python-pillow python-pytesseract scrot tesseract)
allPackages+=(tesseract-data-eng udiskie xorg-setxkbmap xdotool)
;;
mate)
allPackages+=(mate mate-extra orca python-psutil)
;;
esac
fi
# Add bootloader packages
if [[ "$bootMode" == "bios" ]]; then
@@ -1202,6 +1213,9 @@ export EDITOR=nano
export VISUAL=nano
ENV_EOF
# Suppress git default-branch warning for root-run git commands
git config --global init.defaultBranch master
# Note: realtime group is created by realtime-privileges package
# Create users (commands built dynamically before chroot)

View File

@@ -35,5 +35,6 @@ file_permissions=(
["/usr/share/fenrirscreenreader/scripts/ssh-login-monitor.sh"]="0:0:755"
["/etc/stormux-assist"]="0:0:755"
["/etc/stormux-assist/client.conf"]="0:0:644"
["/etc/udev/rules.d/99-brltty.rules"]="0:0:644"
["/home/stormux"]="1000:1000:755"
)