diff --git a/resources/InstallResources/xfce-config/xflock-xsecurelock.patch b/resources/InstallResources/xfce-config/xflock-xsecurelock.patch index 40eddcc..adc9ab7 100644 --- a/resources/InstallResources/xfce-config/xflock-xsecurelock.patch +++ b/resources/InstallResources/xfce-config/xflock-xsecurelock.patch @@ -1,13 +1,12 @@ diff --git a/usr/bin/xflock4 b/usr/bin/xflock4 -index d55cbf7..b7b28c6 +index 32670f4..1e82a40 --- a/usr/bin/xflock4 +++ b/usr/bin/xflock4 -@@ -26,6 +26,7 @@ export PATH +@@ -26,6 +26,7 @@ LOCK_CMD=$(xfconf-query -c xfce4-session -p /general/LockCommand) # Lock by xscreensaver or gnome-screensaver, if a respective daemon is running for lock_cmd in \ -+ "env XSECURELOCK_PASSWORD_PROMPT=asterisks xsecurelock"\ ++ "env XSECURELOCK_PASSWORD_PROMPT=asterisks xsecurelock" \ + "$LOCK_CMD" \ + "xfce4-screensaver-command --lock" \ "xscreensaver-command -lock" \ - "light-locker-command --lock" \ - "gnome-screensaver-command --lock" \ - diff --git a/scripts/InstallScripts/InstallPackages.sh b/scripts/InstallScripts/InstallPackages.sh index 26596b7..7606e2a 100755 --- a/scripts/InstallScripts/InstallPackages.sh +++ b/scripts/InstallScripts/InstallPackages.sh @@ -34,7 +34,7 @@ done dpkg-reconfigure tzdata #Install shared packages -DEBIAN_FRONTEND=noninteractive apt install -y xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils mousepad vlc dconf-cli dconf-editor sudo dtrx emacs25 +DEBIAN_FRONTEND=noninteractive apt install -y xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils mousepad vlc dconf-cli dconf-editor sudo dtrx emacs DEBIAN_FRONTEND=noninteractive apt install -y network-manager-gnome network-manager-openvpn network-manager-openvpn-gnome # #install firefox from buster (if buster repos are present, i.e. installed suite is less than bullseye), otherwise from default suite