Fix XDG handling, replace Xfce with LXQt where appropriate, make USBGuard configuration work

This commit is contained in:
Aaron Rainbolt 2025-08-21 18:39:28 -05:00
parent 37c0bc0c5d
commit df8a323d03
No known key found for this signature in database
GPG key ID: A709160D73C79109
4 changed files with 11 additions and 2 deletions

View file

@ -89,6 +89,10 @@ case "$1" in
## migrate permission_hardener state to v2 if applicable ## migrate permission_hardener state to v2 if applicable
migrate_permission_hardener_state migrate_permission_hardener_state
## Fix usbguard config permissions, this seemingly can't be done
## during the unpack stage
chmod 0600 /etc/usbguard/rules.d/30_security-misc.conf
;; ;;
abort-upgrade|abort-remove|abort-deconfigure) abort-upgrade|abort-remove|abort-deconfigure)

View file

@ -4,7 +4,7 @@
## See the file COPYING for copying conditions. ## See the file COPYING for copying conditions.
if [ -z "$XDG_CONFIG_DIRS" ]; then if [ -z "$XDG_CONFIG_DIRS" ]; then
XDG_CONFIG_DIRS="/etc/xdg" XDG_CONFIG_DIRS="/etc:/etc/xdg:/usr/share"
fi fi
if ! printf '%s\n' "$XDG_CONFIG_DIRS" | grep -- "/usr/share/security-misc/" >/dev/null 2>/dev/null ; then if ! printf '%s\n' "$XDG_CONFIG_DIRS" | grep -- "/usr/share/security-misc/" >/dev/null 2>/dev/null ; then
export XDG_CONFIG_DIRS="/usr/share/security-misc/:$XDG_CONFIG_DIRS" export XDG_CONFIG_DIRS="/usr/share/security-misc/:$XDG_CONFIG_DIRS"

View file

@ -16,7 +16,7 @@
## relies solely on the calling user's UID and GID, though this could require ## relies solely on the calling user's UID and GID, though this could require
## further review.) ## further review.)
## ##
## Without this, Xfce fails to start with a dbus-launch error. ## Without this, LXQt fails to start with a dbus-launch error.
## ##
## TODO: audit pam-tmpdir-helper ## TODO: audit pam-tmpdir-helper
pam-tmpdir-helper matchwhitelist pam-tmpdir-helper matchwhitelist

View file

@ -0,0 +1,5 @@
## Copyright (C) 2025 - 2025 ENCRYPTED SUPPORT LLC <adrelanos@whonix.org>
## See the file COPYING for copying conditions.
[Unit]
ConditionPathExists=/sys/bus/usb