Beta v9.11.1

ci: apply apparmor workaround only if apparmor is running

dietpi-installer: remove temporary workaround for release

dietpi-software: update fallback URL

changelog: add release PR URL

RC up

Author: MichaIng

.build/images/dietpi-build

@@ -443,7 +443,7 @@ then
 	done
 fi
 # ARMv6/7 Trixie: Workaround failing chpasswd, which tries to access /proc/sys/vm/mmap_min_addr, but fails as of AppArmor on the host
-if (( $HW_ARCH < 3 && $DISTRO == 8 ))
+if (( $HW_ARCH < 3 && $DISTRO == 8 )) && systemctl -q is-active apparmor
 then
 	G_EXEC eval 'echo '\''/proc/sys/vm/mmap_min_addr r,'\'' > /etc/apparmor.d/local/unix-chkpwd'
 	G_EXEC_NOHALT=1 G_EXEC_OUTPUT=1 systemctl restart apparmor || { journalctl -n 25; exit 1; }

.build/images/dietpi-installer

@@ -848,9 +848,6 @@ setenv rootuuid "true"' /boot/boot.cmd
 			G_CONFIG_INJECT "G_LIVE_PATCH_STATUS\[$i\]=" "G_LIVE_PATCH_STATUS[$i]='${G_LIVE_PATCH_STATUS[$i]}'" /boot/dietpi/.version
 		done
 
-		# Temporarily fix failing setup partition detection on Quartz64/Star64/VisionFive 2
-		[[ $G_GITOWNER/$G_GITBRANCH == 'MichaIng/master' ]] && G_EXEC curl -sSf 'https://raw.githubusercontent.com/MichaIng/DietPi/54629bf/rootfs/var/lib/dietpi/services/fs_partition_resize.sh' -o /var/lib/dietpi/services/fs_partition_resize.sh
-
 		G_EXEC cp /boot/dietpi/.version /var/lib/dietpi/.dietpi_image_version
 
 		G_EXEC systemctl daemon-reload

.build/software/Amiberry/container_build.bash

@@ -132,7 +132,7 @@ then
 fi
 
 # ARMv6/7 Trixie: Workaround failing chpasswd, which tries to access /proc/sys/vm/mmap_min_addr, but fails as of AppArmor on the host
-if (( $arch < 3 )) && [[ $DISTRO == 'trixie' ]]
+if (( $arch < 3 )) && [[ $DISTRO == 'trixie' ]] && systemctl -q is-active apparmor
 then
 	G_EXEC eval 'echo '\''/proc/sys/vm/mmap_min_addr r,'\'' > /etc/apparmor.d/local/unix-chkpwd'
 	G_EXEC_NOHALT=1 G_EXEC_OUTPUT=1 systemctl restart apparmor || { journalctl -n 25; exit 1; }

.build/software/dietpi-software-build.bash

@@ -129,7 +129,7 @@ then
 fi
 
 # ARMv6/7 Trixie: Workaround failing chpasswd, which tries to access /proc/sys/vm/mmap_min_addr, but fails as of AppArmor on the host
-if (( $arch < 3 )) && [[ $DISTRO == 'trixie' ]]
+if (( $arch < 3 )) && [[ $DISTRO == 'trixie' ]] && systemctl -q is-active apparmor
 then
 	G_EXEC eval 'echo '\''/proc/sys/vm/mmap_min_addr r,'\'' > /etc/apparmor.d/local/unix-chkpwd'
 	G_EXEC_NOHALT=1 G_EXEC_OUTPUT=1 systemctl restart apparmor || { journalctl -n 25; exit 1; }

.github/workflows/dietpi-software.bash

@@ -361,7 +361,7 @@ then
 fi
 
 # ARMv6/7 Trixie: Workaround failing chpasswd, which tries to access /proc/sys/vm/mmap_min_addr, but fails as of AppArmor on the host
-if (( $arch < 3 )) && [[ $DISTRO == 'trixie' ]]
+if (( $arch < 3 )) && [[ $DISTRO == 'trixie' ]] && systemctl -q is-active apparmor
 then
 	G_EXEC eval 'echo '\''/proc/sys/vm/mmap_min_addr r,'\'' > /etc/apparmor.d/local/unix-chkpwd'
 	G_EXEC_NOHALT=1 G_EXEC_OUTPUT=1 systemctl restart apparmor || { journalctl -n 25; exit 1; }

.update/version

@@ -3,7 +3,7 @@
 # Available DietPi version
 G_REMOTE_VERSION_CORE=9
 G_REMOTE_VERSION_SUB=11
-G_REMOTE_VERSION_RC=0
+G_REMOTE_VERSION_RC=1
 # Minimum DietPi version to allow update
 G_MIN_VERSION_CORE=7
 G_MIN_VERSION_SUB=0

CHANGELOG.txt

@@ -8,7 +8,7 @@ Bug fixes:
 - DietPi-Software | Fail2Ban: Resolved an issue where the install failed while downloading updated Dropbear filters. Many thanks to @Stream5710 for reporting this issue: https://github.com/MichaIng/DietPi/issues/7413
 - DietPi-Software | Pi-hole: Support for Pi-hole v6 was added. During the DietPi update, we check whether your Pi-hole has been updated already, and in case perform some migration and cleanup of DietPi-specific configs. Also, since Pi-hole v6 ships with its internal webserver and PHP interpreter, if a webserver and PHP are installed without any dependant among dietpi-software options, it is offered to uninstall them.
 
-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/ADDME
+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/7426
 
 -----------------------------------------------------------------------------------------------------------
 

dietpi/dietpi-software

@@ -9835,7 +9835,7 @@ _EOF_
 				3) local arch='arm64';;
 				*) local arch='x64';;
 			esac
-			local fallback_url="https://github.com/Prowlarr/Prowlarr/releases/download/v1.30.2.4939/Prowlarr.master.1.30.2.4939.linux-core-$arch.tar.gz"
+			local fallback_url="https://github.com/Prowlarr/Prowlarr/releases/download/v1.31.2.4975/Prowlarr.master.1.31.2.4975.linux-core-$arch.tar.gz"
 			Download_Install "$(curl -sSfL 'https://api.github.com/repos/Prowlarr/Prowlarr/releases/latest' | mawk -F\" "/^ *\"browser_download_url\": \".*linux-core-$arch\.tar\.gz\"$/{print \$4}")"
 
 			# Install: Remove previous instance on reinstall

dietpi/func/dietpi-globals

@@ -55,7 +55,7 @@
 	# - Assign defaults/code version as fallback
 	[[ $G_DIETPI_VERSION_CORE ]] || G_DIETPI_VERSION_CORE=9
 	[[ $G_DIETPI_VERSION_SUB ]] || G_DIETPI_VERSION_SUB=11
-	[[ $G_DIETPI_VERSION_RC ]] || G_DIETPI_VERSION_RC=0
+	[[ $G_DIETPI_VERSION_RC ]] || G_DIETPI_VERSION_RC=1
 	[[ $G_GITBRANCH ]] || G_GITBRANCH='master'
 	[[ $G_GITOWNER ]] || G_GITOWNER='MichaIng'
 	# - Save current version and Git branch