v6.33 (#3800)

+ DietPi-Software | TigerVNC+LXDE: Fix lxappearance launch from within TigerVNC LXDE session
MichaIng · Sep 30, 2020 · 34972e8 · 34972e8
1 parent 70c89bf
commit 34972e8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -28,17 +28,17 @@ Bug Fixes:
 - DietPi-Software | WebIOPi: Resolved an issue where the download failed.
 - DietPi-Software | Home Assistant: Resolved an issue where install failed on ARM due to missing new build dependency. Many thanks to @pbutterworth for reporting and @novitibo for providing the solution: https://dietpi.com/phpbb/viewtopic.php?f=11&t=8095
 - DietPi-Software | Kodi: Resolved an issue on Odroid XU4 where install failed due to missing librockchip-mpp1 package which instead was aimed to be installed on Odroid N1 only.
+- DietPi-Software | TigerVNC+LXDE: Resolved an issue where lxappearance start ("Customize Look and Feel") hangs within TigerVNC sessions.
 
 As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pull/XXXX
 
 Known/Outstanding Issues:
 - DietPi-Config | Enabling WiFi + Ethernet adapters, both on different subnets, breaks WiFi connection in some cases: https://github.com/MichaIng/DietPi/issues/2103
-- RPi | On TigerVNC virtual desktop, LXAppearance hangs on dbus-launch: https://github.com/MichaIng/DietPi/issues/1791
 - Odroid C2 | Some WiFi adapters do no work as hotspot: https://github.com/MichaIng/DietPi/issues/1955
 - DietPi-Software | Node-RED: Pre-installed modules cannot be updated via web UI: https://github.com/MichaIng/DietPi/issues/2073
 - DietPi-Software | Raspimjpeg: With Lighttpd, streaming mjpeg does not work: https://github.com/MichaIng/DietPi/issues/1747
 - DietPi-Software | MATE desktop: When logging in as root, desktop items and right-click context menu is missing: https://github.com/MichaIng/DietPi/issues/3160
-- DietPi-Software | Sonarr/Mono: With current Mono version 6, import to a file system without UNIX permissions support (exFAT, FAT32/vfat, CIFS mounts and NTFS without "permissions" option) fails, regardless of user/umask mount options: https://github.com/MichaIng/DietPi/issues/3179
+- DietPi-Software | Sonarr/Radarr/Mono: With current Mono version 6, import to a file system without UNIX permissions support (exFAT, FAT32/vfat, CIFS mounts and NTFS without "permissions" option) fails, regardless of user/umask mount options: https://github.com/MichaIng/DietPi/issues/3179
 - DietPi-Software | Transmission: On Raspbian/Debian Stretch, RAM usage raises unlimited over time: https://github.com/MichaIng/DietPi/issues/2413
 
 For all additional issues that may appear after release, please see the following link for active tickets: https://github.com/MichaIng/DietPi/issues

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
@@ -3006,7 +3006,10 @@ Pin: origin archive.raspberrypi.org
 Pin-Priority: -1
 _EOF_
 			fi
-			G_AGI lxde upower firefox-esr
+			# https://github.com/MichaIng/DietPi/issues/1558#issuecomment-701547904
+			local dbus_package=
+			(( ${aSOFTWARE_INSTALL_STATE[28]} > 0 )) && dbus_package='dbus-user-session'
+			G_AGI lxde upower firefox-esr $dbus_package
 
 		fi
 
@@ -4476,7 +4479,10 @@ amvdec_vp9' > /etc/modules-load.d/dietpi-c4-kodi.conf
 			# - It is a recommendation and no dependency of perl, but expected by some packages depending on perl only: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=939055
 			local netbase=
 			(( $G_DISTRO < 6 )) && netbase='netbase'
-			G_AGI tigervnc-standalone-server tigervnc-common x11vnc $netbase
+			# https://github.com/MichaIng/DietPi/issues/1558#issuecomment-701547904
+			local dbus_package=
+			(( ${aSOFTWARE_INSTALL_STATE[23]} > 0 )) && dbus_package='dbus-user-session'
+			G_AGI tigervnc-standalone-server tigervnc-common x11vnc $netbase $dbus_package
 
 		fi
 
@@ -12652,7 +12658,7 @@ _EOF_
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
-			apt-mark auto upower policykit-1 firefox-esr
+			apt-mark auto upower policykit-1 firefox-esr dbus-user-session
 			G_AGP lxde 'lxde-*'
 			rm -Rf /{root,home/*}/.config/{lxpanel,lxsession,lxterminal}
 			[[ -f '/etc/apt/preferences.d/dietpi-lxde' ]] && rm -v /etc/apt/preferences.d/dietpi-lxde
@@ -13977,7 +13983,9 @@ _EOF_
 			systemctl unmask vncserver-virtuald 2> /dev/null
 			systemctl disable --now vncserver-virtuald 2> /dev/null
 
-			G_AGP tigervnc-* x11vnc realvnc-vnc-server
+			apt-mark auto dbus-user-session
+
+			G_AGP 'tigervnc-*' x11vnc realvnc-vnc-server
 
 			if [[ -f '/etc/systemd/system/vncserver.service' ]]; then
 
@@ -14080,6 +14088,7 @@ _EOF_
 				rm -R /etc/systemd/system/dietpi-nordvpn.service*
 
 			fi
+			[[ -d '/etc/systemd/system/dietpi-nordvpn.service.d' ]] && rm -R /etc/systemd/system/dietpi-nordvpn.service.d
 			rm -Rf /etc/openvpn/ovpn_{tcp,udp}/*nordvpn* /var/lib/dietpi/dietpi-software/installed/dietpi-nordvpn
 			rmdir --ignore-fail-on-non-empty /etc/openvpn/ovpn_{tcp,udp}
 
@@ -14186,10 +14195,10 @@ _EOF_
 			rm -R /var/www/pydio
 
 			# Remove webserver configs
-			command -v a2dissite &> /dev/null && a2dissite dietpi-pydio
+			command -v a2dissite > /dev/null && a2dissite dietpi-pydio
 			[[ -f '/etc/apache2/conf-available/dietpi-pydio.conf' ]] && rm /etc/apache2/conf-available/dietpi-pydio.conf
 			[[ -f '/etc/nginx/sites-dietpi/dietpi-pydio.conf' ]] && rm /etc/nginx/sites-dietpi/dietpi-pydio.conf
-			command -v lighty-disable-mod &> /dev/null && lighty-disable-mod dietpi-pydio
+			command -v lighty-disable-mod > /dev/null && lighty-disable-mod dietpi-pydio
 			[[ -f '/etc/lighttpd/conf-available/99-dietpi-pydio.conf' ]] && rm /etc/lighttpd/conf-available/99-dietpi-pydio.conf
 
 			# Drop database

diff --git a/dietpi/patch_file b/dietpi/patch_file
@@ -2601,6 +2601,9 @@ opcache.max_accelerated_files=10000\nopcache.memory_consumption=128\nopcache.sav
 
 			fi
 			#-------------------------------------------------------------------------------
+			# TigerVNC + LXDE: https://github.com/MichaIng/DietPi/pull/3800
+			(( $G_DIETPI_INSTALL_STAGE == 2 )) && grep -q '^aSOFTWARE_INSTALL_STATE\[28\]=2' /boot/dietpi/.installed && grep -q '^aSOFTWARE_INSTALL_STATE\[23\]=2' /boot/dietpi/.installed && G_AGI dbus-user-session
+			#-------------------------------------------------------------------------------
 			# Last subversion patch completed
 			# - Apply reinstalls
 			if [[ -f '/var/tmp/dietpi/dietpi-update_reinstalls' ]]; then