Merge branch 'dev' into feat/ipvs

* dev: (75 commits) v8.17 (MichaIng#6362) v8.17 v8.17 (MichaIng#6328) v8.17 v8.17 (MichaIng#6356) v8.17 v8.17 v8.17 v8.17 v8.17 (MichaIng#6355) v8.17 v8.17 v8.17 (MichaIng#6353) v8.17 v8.17 v8.17 v8.17 (MichaIng#6339) v8.17 (MichaIng#6303) v8.17 v8.17 ...
disconn3ct · May 3, 2023 · 0f2a562 · 0f2a562
2 parents 22e2030 + c90891e
commit 0f2a562
Show file tree

Hide file tree

Showing 33 changed files with 958 additions and 631 deletions.
diff --git a/.build/images/Quartz64/quartz64_defconfig b/.build/images/Quartz64/quartz64_defconfig
@@ -957,7 +957,9 @@ CONFIG_ARCH_HAS_PTE_SPECIAL=y
 CONFIG_SECRETMEM=y
 # CONFIG_ANON_VMA_NAME is not set
 # CONFIG_USERFAULTFD is not set
-# CONFIG_LRU_GEN is not set
+CONFIG_LRU_GEN=y
+# CONFIG_LRU_GEN_ENABLED is not set
+# CONFIG_LRU_GEN_STATS is not set
 
 #
 # Data Access Monitoring
@@ -2742,7 +2744,7 @@ CONFIG_USB_NET_CDCETHER=m
 # CONFIG_USB_NET_CDC_EEM is not set
 CONFIG_USB_NET_CDC_NCM=m
 # CONFIG_USB_NET_HUAWEI_CDC_NCM is not set
-# CONFIG_USB_NET_CDC_MBIM is not set
+CONFIG_USB_NET_CDC_MBIM=m
 CONFIG_USB_NET_DM9601=m
 # CONFIG_USB_NET_SR9700 is not set
 CONFIG_USB_NET_SR9800=m
@@ -2764,7 +2766,7 @@ CONFIG_USB_ARMLINUX=y
 CONFIG_USB_NET_ZAURUS=m
 # CONFIG_USB_NET_CX82310_ETH is not set
 # CONFIG_USB_NET_KALMIA is not set
-# CONFIG_USB_NET_QMI_WWAN is not set
+CONFIG_USB_NET_QMI_WWAN=m
 # CONFIG_USB_HSO is not set
 # CONFIG_USB_NET_INT51X1 is not set
 # CONFIG_USB_IPHETH is not set
@@ -5447,7 +5449,7 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y
 #
 CONFIG_USB_ACM=m
 # CONFIG_USB_PRINTER is not set
-# CONFIG_USB_WDM is not set
+CONFIG_USB_WDM=m
 # CONFIG_USB_TMC is not set
 
 #
@@ -7240,11 +7242,11 @@ CONFIG_MISC_FILESYSTEMS=y
 CONFIG_SQUASHFS=m
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
-CONFIG_SQUASHFS_DECOMP_SINGLE=y
+CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
 # CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
-CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y
+# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
 # CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
-# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZ4=y

diff --git a/.build/images/dietpi-build b/.build/images/dietpi-build
@@ -542,9 +542,8 @@ then
 	# shellcheck disable=SC2016
 	G_EXEC eval 'echo '\''infocmp "$TERM" > /dev/null 2>&1 || export TERM=dumb'\'' > rootfs/etc/bashrc.d/00-dietpi-build.sh'
 
-	# Workaround for network connection checks
+	# Workaround for failing IPv4 network connectivity check as GitHub Actions runners do not receive external ICMP echo replies.
 	G_CONFIG_INJECT 'CONFIG_CHECK_CONNECTION_IP=' 'CONFIG_CHECK_CONNECTION_IP=127.0.0.1' rootfs/boot/dietpi.txt
-	G_CONFIG_INJECT 'CONFIG_CHECK_DNS_DOMAIN=' 'CONFIG_CHECK_DNS_DOMAIN=localhost' rootfs/boot/dietpi.txt
 
 	# Generate automation custom script for first boot and cleanup steps
 	cat << '_EOF_' > rootfs/boot/Automation_Custom_Script.sh
@@ -612,9 +611,8 @@ _EOF_
 	fi
 	systemd-nspawn -bD rootfs "${abind[@]}" || exit 1
 
-	# Reset network connection check settings
+	# Reset IPv4 network connectivity check setting
 	G_CONFIG_INJECT 'CONFIG_CHECK_CONNECTION_IP=' 'CONFIG_CHECK_CONNECTION_IP=9.9.9.9' rootfs/boot/dietpi.txt
-	G_CONFIG_INJECT 'CONFIG_CHECK_DNS_DOMAIN=' 'CONFIG_CHECK_DNS_DOMAIN=dns9.quad9.net' rootfs/boot/dietpi.txt
 
 	[[ -f 'rootfs/success' ]] || { G_DIETPI-NOTIFY 1 'The container setup did not finish successfully, aborting...'; exit 1; }
 	G_EXEC rm rootfs/success

diff --git a/.build/images/dietpi-installer b/.build/images/dietpi-installer
@@ -377,8 +377,8 @@ _EOF_
 			'55' ': NanoPi R2S'
 			'47' ': NanoPi R4S'
 			'76' ': NanoPi R5S/R5C'
-			'79' ': NanoPi R6S'
-			'72' ': ROCK Pi 4'
+			'79' ': NanoPi R6S/R6C'
+			'72' ': ROCK 4'
 			'73' ': ROCK Pi S'
 			'74' ': Radxa Zero'
 			'77' ': ROCK 3A'
@@ -856,7 +856,7 @@ setenv rootuuid "true"' /boot/boot.cmd
 			)
 
 			# Entropy daemon: Use modern rng-tools5 on all devices where it has been proven to work, else haveged: https://github.com/MichaIng/DietPi/issues/2806
-			if [[ $G_HW_MODEL -lt 10 || $G_HW_MODEL =~ ^14|15|16|24|29|42|46|58|68|72|74|76|78|79|80|81$ ]] # RPi, S922X, Odroid C4, RK3399 - 47 NanoPi R4S, Radxa Zero, NanoPi R5S, ROCK 5B, NanoPi R6S, Orange Pi 5, VisionFive 2
+			if [[ $G_HW_MODEL -lt 10 || $G_HW_MODEL =~ ^14|15|16|24|29|42|46|58|68|72|74|76|78|79|80|81$ ]] # RPi, S922X, Odroid C4, RK3399 - 47 NanoPi R4S, Radxa Zero, NanoPi R5S/R5C, ROCK 5B, NanoPi R6S/R6C, Orange Pi 5, VisionFive 2
 			then
 				aPACKAGES_REQUIRED_INSTALL+=('rng-tools5')
 			else
@@ -1715,7 +1715,7 @@ _EOF_'
 			/boot/dietpi/func/dietpi-set_hardware serialconsole enable ttySAC0
 			/boot/dietpi/func/dietpi-set_hardware serialconsole enable ttyGS0
 
-		# ROCKPro64, ROCK64, Pinebook Pro, NanoPi R4S, Quartz64, ASUS Tinker Board, NanoPi R2S, NanoPi NEO3, NanoPi M4V2, NanoPi M4/T4/NEO4, ROCK Pi 4, ROCK 3A
+		# ROCKPro64, ROCK64, Pinebook Pro, NanoPi R4S, Quartz64, ASUS Tinker Board, NanoPi R2S, NanoPi NEO3, NanoPi M4V2, NanoPi M4/T4/NEO4, ROCK 4, ROCK 3A
 		elif [[ $G_HW_MODEL =~ ^42|43|46|47|49|52|55|56|58|68|72|77$ ]]
 		then
 			/boot/dietpi/func/dietpi-set_hardware serialconsole enable ttyS2
@@ -1730,7 +1730,7 @@ _EOF_'
 		then
 			/boot/dietpi/func/dietpi-set_hardware serialconsole enable ttyS1
 
-		# NanoPi R5S, ROCK 5B, NanoPi R6S, Orange Pi 5
+		# NanoPi R5S/R5C, ROCK 5B, NanoPi R6S/R6C, Orange Pi 5
 		elif [[ $G_HW_MODEL =~ ^76|78|79|80$ ]]
 		then
 			/boot/dietpi/func/dietpi-set_hardware serialconsole enable ttyFIQ0
@@ -1965,35 +1965,35 @@ _EOF_
 			G_DIETPI-NOTIFY 2 'Enabling NanoPi R4S Ethernet LEDs'
 			G_EXEC eval 'echo '\''ledtrig-netdev'\'' > /etc/modules-load.d/dietpi-eth-leds.conf'
 			cat << '_EOF_' > /etc/udev/rules.d/dietpi-eth-leds.rules
-SUBSYSTEM=="leds", KERNEL=="lan_led", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="eth0", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1"
-SUBSYSTEM=="leds", KERNEL=="wan_led", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="eth1", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1"
+SUBSYSTEM=="leds", KERNEL=="lan_led", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="eth0", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1", RUN+="/bin/ip l s up dev eth0", RUN+="/bin/ip l s down dev eth0"
+SUBSYSTEM=="leds", KERNEL=="wan_led", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="eth1", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1", RUN+="/bin/ip l s up dev eth1", RUN+="/bin/ip l s down dev eth1"
 _EOF_
 		# NanoPi R2S
 		elif (( $G_HW_MODEL == 55 ))
 		then
 			G_DIETPI-NOTIFY 2 'Enabling NanoPi R2S Ethernet LEDs'
 			G_EXEC eval 'echo '\''ledtrig-netdev'\'' > /etc/modules-load.d/dietpi-eth-leds.conf'
 			cat << '_EOF_' > /etc/udev/rules.d/dietpi-eth-leds.rules
-SUBSYSTEM=="leds", KERNEL=="wan_led", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="eth0", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1"
-SUBSYSTEM=="leds", KERNEL=="lan_led", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="eth1", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1"
+SUBSYSTEM=="leds", KERNEL=="wan_led", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="eth0", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1", RUN+="/bin/ip l s up dev eth0", RUN+="/bin/ip l s down dev eth0"
+SUBSYSTEM=="leds", KERNEL=="lan_led", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="eth1", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1", RUN+="/bin/ip l s up dev eth1", RUN+="/bin/ip l s down dev eth1"
 _EOF_
-		# NanoPi R5S/R5C
+		# NanoPi R5S/R5C: In case, will be updated for R5C on first boot
 		elif (( $G_HW_MODEL == 76 ))
 		then
-			G_DIETPI-NOTIFY 2 'Enabling NanoPi R5S Ethernet LEDs'
+			G_DIETPI-NOTIFY 2 'Enabling NanoPi R5S/R5C Ethernet LEDs'
 			G_EXEC eval 'echo '\''ledtrig-netdev'\'' > /etc/modules-load.d/dietpi-eth-leds.conf'
 			cat << '_EOF_' > /etc/udev/rules.d/dietpi-eth-leds.rules
-SUBSYSTEM=="leds", KERNEL=="wan_led", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="eth0", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1"
-SUBSYSTEM=="leds", KERNEL=="lan1_led", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="eth1", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1"
-SUBSYSTEM=="leds", KERNEL=="lan2_led", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="eth2", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1"
+SUBSYSTEM=="leds", KERNEL=="wan_led", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="eth0", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1", RUN+="/bin/ip l s up dev eth0", RUN+="/bin/ip l s down dev eth0"
+SUBSYSTEM=="leds", KERNEL=="lan1_led", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="eth1", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1", RUN+="/bin/ip l s up dev eth1", RUN+="/bin/ip l s down dev eth1"
+SUBSYSTEM=="leds", KERNEL=="lan2_led", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="eth2", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1", RUN+="/bin/ip l s up dev eth2", RUN+="/bin/ip l s down dev eth2"
 _EOF_
-		# NanoPi R6S/R6C
+		# NanoPi R6S/R6C: In case, will be updated for R6C on first boot
 		elif (( $G_HW_MODEL == 79 ))
 		then
-			G_DIETPI-NOTIFY 2 'Enabling NanoPi R6S Ethernet LEDs'
+			G_DIETPI-NOTIFY 2 'Enabling NanoPi R6S/R6C Ethernet LEDs'
 			G_EXEC eval 'echo '\''ledtrig-netdev'\'' > /etc/modules-load.d/dietpi-eth-leds.conf'
 			cat << '_EOF_' > /etc/udev/rules.d/dietpi-eth-leds.rules
-SUBSYSTEM=="leds", KERNEL=="lan2_led", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="eth0", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1"
+SUBSYSTEM=="leds", KERNEL=="lan2_led", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="eth0", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1", RUN+="/bin/ip l s up dev eth0", RUN+="/bin/ip l s down dev eth0"
 SUBSYSTEM=="leds", KERNEL=="lan1_led", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="eth1", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1"
 SUBSYSTEM=="leds", KERNEL=="wan_led", ACTION=="add", ATTR{trigger}="netdev", ATTR{device_name}="eth2", ATTR{link}="1", ATTR{rx}="1", ATTR{tx}="1"
 _EOF_

diff --git a/.build/software/Amiberry/build.bash b/.build/software/Amiberry/build.bash
@@ -7,7 +7,7 @@
 G_DIETPI-NOTIFY 2 "Amiberry will be built for platform: \e[33m$PLATFORM"
 
 # APT dependencies
-# - wget: Used for WHDLoad database update: https://github.com/BlitterStudio/amiberry/commit/d6c103e3310bcf75c2d72a15849fbdf5eb7432b5
+# - wget: Used for WHDLoad database update: https://github.com/BlitterStudio/amiberry/commit/d6c103e
 # - kbd: For "chvt" used in systemd service
 adeps_build=('autoconf' 'make' 'g++' 'pkg-config' 'libdrm-dev' 'libgbm-dev' 'libudev-dev' 'libxml2-dev' 'libpng-dev' 'libfreetype6-dev' 'libflac-dev' 'libmpg123-dev' 'libmpeg2-4-dev' 'libasound2-dev' 'libserialport-dev' 'wget' 'kbd')
 adeps=('libdrm2' 'libgl1-mesa-dri' 'libgbm1' 'libegl1' 'libudev1' 'libxml2' 'libpng16-16' 'libfreetype6' 'libmpg123-0' 'libmpeg2-4' 'libasound2' 'libserialport0' 'wget' 'kbd')
@@ -31,7 +31,7 @@ then
 	G_EXEC tar xf "SDL2-$v_sdl.tar.gz"
 	G_EXEC rm "SDL2-$v_sdl.tar.gz"
 	G_EXEC cd "SDL2-$v_sdl"
-	G_EXEC_OUTPUT=1 G_EXEC ./configure CFLAGS='-g0 -O3' CXXFLAGS='-g0 -O3' --enable-video-kmsdrm "${opengl_flags[@]}" --disable-video-rpi --disable-video-x11 --disable-video-wayland --disable-video-opengles1 --disable-video-vulkan --disable-video-dummy --disable-diskaudio --disable-sndio --disable-dummyaudio --disable-oss --disable-dbus
+	G_EXEC_OUTPUT=1 G_EXEC ./configure CFLAGS='-g0 -O3' CXXFLAGS='-g0 -O3' --enable-video-kmsdrm "${opengl_flags[@]}" --disable-video-rpi --disable-video-x11 --disable-video-wayland --disable-video-opengles1 --disable-video-vulkan --disable-video-offscreen --disable-video-dummy --disable-diskaudio --disable-sndio --disable-dummyaudio --disable-oss --disable-dbus
 	G_EXEC_OUTPUT=1 G_EXEC make "-j$(nproc)"
 	find . -type f \( -name '*.so' -o -name '*.so.*' \) -exec strip --strip-unneeded --remove-section=.comment --remove-section=.note -v {} +
 	G_EXEC rm -f /usr/local/lib/libSDL2[.-]*

diff --git a/.build/software/Amiberry/container_build.bash b/.build/software/Amiberry/container_build.bash
@@ -66,7 +66,7 @@ G_AG_CHECK_INSTALL_PREREQ "${apackages[@]}"
 G_EXEC curl -sSfO "https://dietpi.com/downloads/images/$image.7z"
 G_EXEC 7zz x "$image.7z"
 G_EXEC rm "$image.7z" hash.txt README.md
-G_EXEC truncate -s $((2*1024**3)) "$image.img"
+G_EXEC truncate -s 2G "$image.img"
 
 # Loop device
 FP_LOOP=$(losetup -f)
@@ -92,9 +92,8 @@ G_EXEC rm rootfs/root/.ssh/known_hosts
 # shellcheck disable=SC2016
 G_EXEC eval 'echo '\''infocmp "$TERM" > /dev/null 2>&1 || export TERM=dumb'\'' > rootfs/etc/bashrc.d/00-dietpi-build.sh'
 
-# Workaround for network connection checks
+# Workaround for failing IPv4 network connectivity check as GitHub Actions runners do not receive external ICMP echo replies.
 G_CONFIG_INJECT 'CONFIG_CHECK_CONNECTION_IP=' 'CONFIG_CHECK_CONNECTION_IP=127.0.0.1' rootfs/boot/dietpi.txt
-G_CONFIG_INJECT 'CONFIG_CHECK_DNS_DOMAIN=' 'CONFIG_CHECK_DNS_DOMAIN=localhost' rootfs/boot/dietpi.txt
 
 # - RPi 64-bit: Add RPi repo, ARMv6 container images contain it already
 [[ $PLATFORM != 'rpi'[34]'-64-dmx' ]] || cat << _EOF_ > rootfs/boot/Automation_Custom_Script.sh || exit 1
@@ -116,6 +115,6 @@ _EOF_
 ##########################################
 # Boot container
 ##########################################
-systemd-nspawn -bD rootfs --bind="$FP_LOOP"{,p1} --bind=/dev/disk
+systemd-nspawn -bD rootfs
 [[ -f rootfs/amiberry_$PLATFORM.deb ]] || exit 1
 }
diff --git a/.build/software/gmediarender/container_build.bash b/.build/software/gmediarender/container_build.bash
@@ -72,7 +72,7 @@ G_AG_CHECK_INSTALL_PREREQ "${apackages[@]}"
 G_EXEC curl -sSfO "https://dietpi.com/downloads/images/$image.7z"
 G_EXEC 7zz e "$image.7z" "$image.img"
 G_EXEC rm "$image.7z"
-G_EXEC truncate -s $((2*1024**3)) "$image.img"
+G_EXEC truncate -s 2G "$image.img"
 
 # Loop device
 FP_LOOP=$(losetup -f)
@@ -101,9 +101,8 @@ G_EXEC rm rootfs/root/.ssh/known_hosts
 # shellcheck disable=SC2016
 G_EXEC eval 'echo '\''infocmp "$TERM" > /dev/null 2>&1 || export TERM=dumb'\'' > rootfs/etc/bashrc.d/00-dietpi-build.sh'
 
-# Workaround for network connection checks
+# Workaround for failing IPv4 network connectivity check as GitHub Actions runners do not receive external ICMP echo replies.
 G_CONFIG_INJECT 'CONFIG_CHECK_CONNECTION_IP=' 'CONFIG_CHECK_CONNECTION_IP=127.0.0.1' rootfs/boot/dietpi.txt
-G_CONFIG_INJECT 'CONFIG_CHECK_DNS_DOMAIN=' 'CONFIG_CHECK_DNS_DOMAIN=localhost' rootfs/boot/dietpi.txt
 
 # Automated build
 cat << _EOF_ > rootfs/boot/Automation_Custom_Script.sh || exit 1
@@ -117,6 +116,6 @@ _EOF_
 ##########################################
 # Boot container
 ##########################################
-systemd-nspawn -bD rootfs --bind="$FP_LOOP"{,p1} --bind=/dev/disk
+systemd-nspawn -bD rootfs
 [[ -f rootfs/gmediarender_$arch.deb ]] || exit 1
 }
diff --git a/.build/software/gogs/container_build.bash b/.build/software/gogs/container_build.bash
@@ -72,7 +72,7 @@ G_AG_CHECK_INSTALL_PREREQ "${apackages[@]}"
 G_EXEC curl -sSfO "https://dietpi.com/downloads/images/$image.7z"
 G_EXEC 7zz e "$image.7z" "$image.img"
 G_EXEC rm "$image.7z"
-G_EXEC truncate -s $((2*1024**3)) "$image.img"
+G_EXEC truncate -s 2G "$image.img"
 
 # Loop device
 FP_LOOP=$(losetup -f)
@@ -102,9 +102,8 @@ G_EXEC rm rootfs/root/.ssh/known_hosts
 # shellcheck disable=SC2016
 G_EXEC eval 'echo '\''infocmp "$TERM" > /dev/null 2>&1 || export TERM=dumb'\'' > rootfs/etc/bashrc.d/00-dietpi-build.sh'
 
-# Workaround for network connection checks
+# Workaround for failing IPv4 network connectivity check as GitHub Actions runners do not receive external ICMP echo replies.
 G_CONFIG_INJECT 'CONFIG_CHECK_CONNECTION_IP=' 'CONFIG_CHECK_CONNECTION_IP=127.0.0.1' rootfs/boot/dietpi.txt
-G_CONFIG_INJECT 'CONFIG_CHECK_DNS_DOMAIN=' 'CONFIG_CHECK_DNS_DOMAIN=localhost' rootfs/boot/dietpi.txt
 
 # Automated build
 cat << _EOF_ > rootfs/boot/Automation_Custom_Script.sh || exit 1
@@ -118,6 +117,6 @@ _EOF_
 ##########################################
 # Boot container
 ##########################################
-systemd-nspawn -bD rootfs --bind="$FP_LOOP"{,p1} --bind=/dev/disk
+systemd-nspawn -bD rootfs
 [[ -f rootfs/gogs_$arch.7z ]] || exit 1
 }
diff --git a/.build/software/shairport-sync/container_build.bash b/.build/software/shairport-sync/container_build.bash
@@ -72,7 +72,7 @@ G_AG_CHECK_INSTALL_PREREQ "${apackages[@]}"
 G_EXEC curl -sSfO "https://dietpi.com/downloads/images/$image.7z"
 G_EXEC 7zz e "$image.7z" "$image.img"
 G_EXEC rm "$image.7z"
-G_EXEC truncate -s $((2*1024**3)) "$image.img"
+G_EXEC truncate -s 2G "$image.img"
 
 # Loop device
 FP_LOOP=$(losetup -f)
@@ -101,9 +101,8 @@ G_EXEC rm rootfs/root/.ssh/known_hosts
 # shellcheck disable=SC2016
 G_EXEC eval 'echo '\''infocmp "$TERM" > /dev/null 2>&1 || export TERM=dumb'\'' > rootfs/etc/bashrc.d/00-dietpi-build.sh'
 
-# Workaround for network connection checks
+# Workaround for failing IPv4 network connectivity check as GitHub Actions runners do not receive external ICMP echo replies.
 G_CONFIG_INJECT 'CONFIG_CHECK_CONNECTION_IP=' 'CONFIG_CHECK_CONNECTION_IP=127.0.0.1' rootfs/boot/dietpi.txt
-G_CONFIG_INJECT 'CONFIG_CHECK_DNS_DOMAIN=' 'CONFIG_CHECK_DNS_DOMAIN=localhost' rootfs/boot/dietpi.txt
 
 # Automated build
 cat << _EOF_ > rootfs/boot/Automation_Custom_Script.sh || exit 1
@@ -117,6 +116,6 @@ _EOF_
 ##########################################
 # Boot container
 ##########################################
-systemd-nspawn -bD rootfs --bind="$FP_LOOP"{,p1} --bind=/dev/disk
+systemd-nspawn -bD rootfs
 [[ -f rootfs/shairport-sync_$arch.deb ]] || exit 1
 }
diff --git a/.build/software/squeezelite/container_build.bash b/.build/software/squeezelite/container_build.bash
@@ -72,7 +72,7 @@ G_AG_CHECK_INSTALL_PREREQ "${apackages[@]}"
 G_EXEC curl -sSfO "https://dietpi.com/downloads/images/$image.7z"
 G_EXEC 7zz e "$image.7z" "$image.img"
 G_EXEC rm "$image.7z"
-G_EXEC truncate -s $((2*1024**3)) "$image.img"
+G_EXEC truncate -s 2G "$image.img"
 
 # Loop device
 FP_LOOP=$(losetup -f)
@@ -101,9 +101,8 @@ G_EXEC rm rootfs/root/.ssh/known_hosts
 # shellcheck disable=SC2016
 G_EXEC eval 'echo '\''infocmp "$TERM" > /dev/null 2>&1 || export TERM=dumb'\'' > rootfs/etc/bashrc.d/00-dietpi-build.sh'
 
-# Workaround for network connection checks
+# Workaround for failing IPv4 network connectivity check as GitHub Actions runners do not receive external ICMP echo replies.
 G_CONFIG_INJECT 'CONFIG_CHECK_CONNECTION_IP=' 'CONFIG_CHECK_CONNECTION_IP=127.0.0.1' rootfs/boot/dietpi.txt
-G_CONFIG_INJECT 'CONFIG_CHECK_DNS_DOMAIN=' 'CONFIG_CHECK_DNS_DOMAIN=localhost' rootfs/boot/dietpi.txt
 
 # Automated build
 cat << _EOF_ > rootfs/boot/Automation_Custom_Script.sh || exit 1
@@ -117,6 +116,6 @@ _EOF_
 ##########################################
 # Boot container
 ##########################################
-systemd-nspawn -bD rootfs --bind="$FP_LOOP"{,p1} --bind=/dev/disk
+systemd-nspawn -bD rootfs
 [[ -f rootfs/squeezelite_$arch.deb ]] || exit 1
 }
diff --git a/.build/software/vaultwarden/build.bash b/.build/software/vaultwarden/build.bash
@@ -207,12 +207,7 @@ G_EXEC curl -sSfo package.deb "https://dietpi.com/downloads/binaries/$G_DISTRO_N
 old_version=$(dpkg-deb -f package.deb Version)
 G_EXEC rm package.deb
 suffix=${old_version#*-dietpi}
-if [[ $old_version == "$version-"* ]]
-then
-	version+="-dietpi$((suffix+1))"
-else
-	version+="-dietpi1"
-fi
+[[ $old_version == "$version-"* ]] && version+="-dietpi$((suffix+1))" || version+="-dietpi1"
 
 # - control
 cat << _EOF_ > "$DIR/DEBIAN/control"

diff --git a/.build/software/vaultwarden/container_build.bash b/.build/software/vaultwarden/container_build.bash
@@ -72,7 +72,7 @@ G_AG_CHECK_INSTALL_PREREQ "${apackages[@]}"
 G_EXEC curl -sSfO "https://dietpi.com/downloads/images/$image.7z"
 G_EXEC 7zz e "$image.7z" "$image.img"
 G_EXEC rm "$image.7z"
-G_EXEC truncate -s $((2*1024**3)) "$image.img"
+G_EXEC truncate -s 2G "$image.img"
 
 # Loop device
 FP_LOOP=$(losetup -f)
@@ -101,9 +101,8 @@ G_EXEC rm rootfs/root/.ssh/known_hosts
 # shellcheck disable=SC2016
 G_EXEC eval 'echo '\''infocmp "$TERM" > /dev/null 2>&1 || export TERM=dumb'\'' > rootfs/etc/bashrc.d/00-dietpi-build.sh'
 
-# Workaround for network connection checks
+# Workaround for failing IPv4 network connectivity check as GitHub Actions runners do not receive external ICMP echo replies.
 G_CONFIG_INJECT 'CONFIG_CHECK_CONNECTION_IP=' 'CONFIG_CHECK_CONNECTION_IP=127.0.0.1' rootfs/boot/dietpi.txt
-G_CONFIG_INJECT 'CONFIG_CHECK_DNS_DOMAIN=' 'CONFIG_CHECK_DNS_DOMAIN=localhost' rootfs/boot/dietpi.txt
 
 # Automated build
 cat << _EOF_ > rootfs/boot/Automation_Custom_Script.sh || exit 1
@@ -117,6 +116,6 @@ _EOF_
 ##########################################
 # Boot container
 ##########################################
-systemd-nspawn -bD rootfs --bind="$FP_LOOP"{,p1} --bind=/dev/disk
+systemd-nspawn -bD rootfs
 [[ -f rootfs/vaultwarden_$arch.deb ]] || exit 1
 }
diff --git a/.conf/dps_27/apache.tasmoadmin.conf b/.conf/dps_27/apache.tasmoadmin.conf
@@ -1,4 +1,4 @@
-<Directory /var/www/tasmoadmin/>
+<Directory /var/www/tasmoadmin>
 	Require all granted
 	AllowOverride All
 	Options FollowSymLinks

diff --git a/.conf/dps_27/lighttpd.tasmoadmin.conf b/.conf/dps_27/lighttpd.tasmoadmin.conf
@@ -1,10 +1,13 @@
 $HTTP["url"] =~ "^/tasmoadmin($|/)" {
-	# Restrict direct access to .htaccess and data directory
+	# Deny direct access to .htaccess and data directory
 	$HTTP["url"] =~ "^/tasmoadmin/(\.|data)" {
-		url.access-deny = ("")
+		# Allow direct access to firmwares
+		$HTTP["url"] !~ "^/tasmoadmin/data/firmwares" {
+			url.access-deny = ("")
+		}
 	}
 
-	# TasmoAdmin URL rewrite, required for sync clients
+	# TasmoAdmin URL rewrites required for sync clients
 	url.rewrite-if-not-file = (
 		"^/tasmoadmin/doAjax$" => "/tasmoadmin/index.php?doAjax=doAjax",
 		"^/tasmoadmin/doAjaxAll$" => "/tasmoadmin/index.php?doAjaxAll=doAjaxAll",