v8.4

- DietPi-PREP | Apply haveged bug workaround for ARMv7
- DietPi-Patches | Bring forward haveged workaround for ARMv7 and merge another workaround for ARM on Buster.

Author: MichaIng

.update/patches

@@ -186,9 +186,6 @@ Patch_7_3()
 	# This is required to call our software CLI wrapper scripts, which contain "sudo -u <service_user>" to assure correct config and data is loaded.
 	[[ -f '/etc/sudoers.d/dietpi' ]] && echo 'dietpi ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/dietpi
 
-	# When haveged from Bullseye was installed on Buster (on ARM to workaround a bug), mark the related library as auto-installed so that it can be autoremoved when haveged itself is removed.
-	dpkg-query -s haveged &> /dev/null && dpkg-query -s libhavege2 &> /dev/null && G_EXEC apt-mark auto libhavege2
-
 	# Update DietPi-Backup filter file
 	if [[ -f '/boot/dietpi/.dietpi-backup_inc_exc' && $(head -1 /boot/dietpi/.dietpi-backup_inc_exc) != '# DietPi-Backup include/exclude filter' ]]
 	then
@@ -306,17 +303,8 @@ Patch_7_6()
 		G_EXEC curl -sSfLO "https://dietpi.com/downloads/binaries/buster/haveged_$G_HW_ARCH_NAME.deb"
 		G_AGI "./libhavege2_$G_HW_ARCH_NAME.deb" "./haveged_$G_HW_ARCH_NAME.deb"
 		G_EXEC rm "./libhavege2_$G_HW_ARCH_NAME.deb" "./haveged_$G_HW_ARCH_NAME.deb"
-	fi
-
-	# https://github.com/MichaIng/DietPi/issues/4710
-	if [[ $G_DISTRO -ge 5 && $G_HW_ARCH == 2 ]] && dpkg-query -s haveged &> /dev/null
-	then
-		G_DIETPI-NOTIFY 2 'Applying workaround for haveged entropy daemon bug:'
-		G_DIETPI-NOTIFY 2 ' - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=985196'
-		G_EXEC mkdir -p /etc/systemd/system/haveged.service.d
-		G_EXEC eval "echo -e '[Service]\nSystemCallFilter=uname' > /etc/systemd/system/haveged.service.d/dietpi.conf"
-		G_EXEC systemctl daemon-reload
-		G_EXEC systemctl restart haveged
+		# Mark the library as auto-installed so that it can be autoremoved when haveged itself is removed.
+		G_EXEC apt-mark auto libhavege2
 	fi
 }
 
@@ -743,6 +731,16 @@ Patch_8_4()
 		G_EXEC rm /etc/kernel/preinst.d/dietpi-initramfs_cleanup
 		G_EXEC rmdir --ignore-fail-on-non-empty /etc/kernel/preinst.d
 	fi
+
+	# https://github.com/MichaIng/DietPi/issues/4710
+	if (( $G_HW_ARCH == 2 )) && dpkg-query -s haveged &> /dev/null
+	then
+		G_DIETPI-NOTIFY 2 'Applying workaround for haveged entropy daemon bug: https://bugs.debian.org/985196'
+		[[ -d '/etc/systemd/system/haveged.service.d' ]] || G_EXEC mkdir /etc/systemd/system/haveged.service.d
+		G_EXEC eval 'echo -e '\''[Service]\nSystemCallFilter=uname'\'' > /etc/systemd/system/haveged.service.d/dietpi.conf'
+		G_EXEC systemctl daemon-reload
+		G_EXEC systemctl restart haveged
+	fi
 }
 
 # v6.35 => v7 migration

PREP_SYSTEM_FOR_DIETPI.sh

@@ -688,6 +688,13 @@ _EOF_
 				aPACKAGES_REQUIRED_INSTALL+=('rng-tools5')
 			else
 				aPACKAGES_REQUIRED_INSTALL+=('haveged')
+				# https://github.com/MichaIng/DietPi/issues/4710
+				if (( $G_HW_ARCH == 2 ))
+				then
+					G_DIETPI-NOTIFY 2 'Applying workaround for haveged entropy daemon bug: https://bugs.debian.org/985196'
+					[[ -d '/etc/systemd/system/haveged.service.d' ]] || G_EXEC mkdir /etc/systemd/system/haveged.service.d
+					G_EXEC eval 'echo -e '\''[Service]\nSystemCallFilter=uname'\'' > /etc/systemd/system/haveged.service.d/dietpi.conf'
+				fi
 			fi
 
 			# G_DISTRO specific