Merge pull request #7840 from MichaIng/dev

Beta v9.20.0

Author: MichaIng

.build/images/dietpi-build

@@ -147,9 +147,9 @@ case $HW_MODEL in
 	73) iname='ROCKPiS' HW_ARCH=3 partition_start=16 root_size=1200;;
 	74) iname='RadxaZero' HW_ARCH=3 partition_start=4 root_size=1148;;
 	75) iname='Container' HW_ARCH=${HW_ARCH:-10} root_size=700;;
-	'76.1') iname='NanoPiR5S' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
-	'76.2') iname='NanoPiR5C' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
-	77) iname='ROCK3A' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
+	'76.1') iname='NanoPiR5S' HW_ARCH=3 partition_start=16 root_size=1200;;
+	'76.2') iname='NanoPiR5C' HW_ARCH=3 partition_start=16 root_size=1200;;
+	77) iname='ROCK3A' HW_ARCH=3 partition_start=16 root_size=1200;;
 	78) iname='ROCK5B' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
 	'79.1') iname='NanoPiR6S' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
 	'79.2') iname='NanoPiR6C' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
@@ -161,10 +161,10 @@ case $HW_MODEL in
 	84) iname='Star64' HW_ARCH=11 root_size=800;;
 	85) iname='ROCK5A' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
 	86) iname='ASUSTB2' HW_ARCH=3 partition_start=16 root_size=1200;;
-	87) iname='OrangePi3B' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
+	87) iname='OrangePi3B' HW_ARCH=3 partition_start=16 root_size=1200;;
 	88) iname='OrangePiZero2W' HW_ARCH=3 partition_start=4 root_size=1148;;
 	89) iname='OrangePi3LTS' HW_ARCH=3 partition_start=4 root_size=1000;;
-	90) iname='RadxaZERO3' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
+	90) iname='RadxaZERO3' HW_ARCH=3 partition_start=16 root_size=1200;;
 	91) iname='OrangePi5Max' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
 	92) iname='NanoPiM6' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;
 	93) iname='OrangePi5Pro' HW_ARCH=3 PTTYPE='gpt' partition_start=16 root_size=1200;;

.build/images/dietpi-imager

@@ -670,7 +670,16 @@ _EOF_
 
 			# Clone disk
 			G_EXEC mkdir -p tmpiso/home/partimag
-			G_EXEC_DESC='Cloning disk with Clonezilla' G_EXEC_OUTPUT=1 G_EXEC ocs-sr -or "$PWD/tmpiso/home/partimag" -nogui -fsck-y -q2 -b -j2 -z5p -i 4096 -senc -sc savedisk "$OUTPUT_IMG_NAME" "${FP_SOURCE##*/}"
+			# -q2: use partclone (default)
+			# -z5p: multi-threaded xz-compression
+			# -j2: save data between MBR and first partition, e.g. bootloader
+			# -b: batch mode: no ocs prompts
+			# --nogui: no partclone TUI
+			# -fsck-y: auto check+repair source before cloning
+			# -i 4096: split image to max 4 GiB volumes
+			# -senc: do not encrypt image
+			# -sc: skip check if image is restorable
+			G_EXEC_DESC='Cloning disk with Clonezilla' G_EXEC_OUTPUT=1 G_EXEC ocs-sr -or "$PWD/tmpiso/home/partimag" --nogui -fsck-y -q2 -b -j2 -z5p -i 4096 -senc -sc savedisk "$OUTPUT_IMG_NAME" "${FP_SOURCE##*/}"
 
 			# Remove loop device
 			Delete_Loopback
@@ -679,7 +688,7 @@ _EOF_
 			G_EXEC rm -f "tmpiso/home/partimag/$OUTPUT_IMG_NAME/"{Info*txt,*list,clonezilla-img}
 
 			# Check image
-			G_EXEC_DESC='Checking Clonezilla image' G_EXEC_OUTPUT=1 G_EXEC ocs-chkimg -or "$PWD/tmpiso/home/partimag" -nogui -b "$OUTPUT_IMG_NAME"
+			G_EXEC_DESC='Checking Clonezilla image' G_EXEC_OUTPUT=1 G_EXEC ocs-chkimg -or "$PWD/tmpiso/home/partimag" --nogui -b "$OUTPUT_IMG_NAME"
 
 			### Prepare custom files used by the installer when booting in UEFI mode ###
 			# Create a GRUB theme for the main menu
@@ -706,6 +715,10 @@ _EOF_
 			G_EXEC mv tmpiso/boot/grub/{grub,clonezilla}.cfg
 			sed '/^menuentry /,$d' tmpiso/boot/grub/clonezilla.cfg > tmpiso/boot/grub/grub.cfg
 			sed -n '/menuentry .*Safe graphic/,/}/s/^  //p' tmpiso/boot/grub/clonezilla.cfg >> tmpiso/boot/grub/grub.cfg
+			# -e2: use CHS geometry info from EDD for partition creation with sfdisk
+			# -icds: skip disk size check before creating partition table
+			# -k1: resize partition after creation
+			# -r: resize filesystem after partition resize
 			# shellcheck disable=SC2016
 			sed --follow-symlinks -i  -e '/^set timeout=/c\set timeout="-1"' -e '/^set pref=/a\set theme=\$pref/theme.txt' -e '/^menuentry /c\menuentry "Install DietPi" {' \
 				-e 's/locales= /locales=C.UTF-8 /' -e 's/keyboard-layouts= /keyboard-layouts=gb /' -e 's/ocs-live-general/ocs-live-restore/' \

.build/images/dietpi-installer

@@ -257,7 +257,7 @@ _EOF_
 			# Stop, disable and remove DietPi services
 			for i in /etc/systemd/system/dietpi-*
 			do
-				[[ -f $i ]] && G_EXEC systemctl disable --now "${i##*/}"
+				[[ -f $i ]] && G_EXEC systemctl --no-reload disable --now "${i##*/}"
 				G_EXEC rm -Rf "$i"
 			done
 
@@ -788,6 +788,7 @@ setenv rootuuid "true"' /boot/boot.cmd
 				esac
 				# Overlays
 				case $G_HW_MODEL in
+					80|91|94) G_CONFIG_INJECT 'overlays=' 'overlays=dwc3-host' /boot/dietpiEnv.txt;; # Switch USB-C and vertical USB 2.0 (shares controller with USB-C) to host mode by default
 					92) G_CONFIG_INJECT 'overlays=' 'overlays=display-dsi1-yx35' /boot/dietpiEnv.txt;; # Enable builtin LCD of official case
 					*) :;;
 				esac
@@ -944,8 +945,8 @@ setenv rootuuid "true"' /boot/boot.cmd
 		G_DIETPI-NOTIFY 2 'Disabling apt-daily services to prevent random APT cache lock'
 		for i in apt-daily{,-upgrade}.{service,timer}
 		do
-			G_EXEC systemctl disable --now "$i"
-			G_EXEC systemctl mask "$i"
+			G_EXEC systemctl --no-reload disable --now "$i"
+			G_EXEC systemctl --no-reload mask "$i"
 		done
 
 		G_DIETPI-NOTIFY 2 'Purging configs/data of removed packages'
@@ -1236,7 +1237,7 @@ _EOF_
 				87) model='orangepi3b' kernel='rockchip64';;
 				88) model='orangepizero2w' kernel='sunxi64';;
 				89) model='orangepi3-lts' kernel='sunxi64';;
-				90) model='radxa-zero3' kernel='rk35xx' branch='vendor';;
+				90) model='radxa-zero3' kernel='rockchip64';;
 				91) model='orangepi5-max' kernel='rk35xx' branch='vendor';;
 				92) model='nanopi-m6' kernel='rk35xx' branch='vendor';;
 				93) model='orangepi5pro' kernel='rk35xx' branch='vendor';;
@@ -1826,11 +1827,11 @@ _EOF_
 			for j in /etc/init.d/$i /{etc,lib,usr/lib,usr/local/lib}/systemd/system/{$i.service{,.d},*.wants/$i.service}
 			do
 				[[ -e $j || -L $j ]] || continue
-				[[ -f $j ]] && G_EXEC systemctl disable --now "${j##*/}"
+				[[ -f $j ]] && G_EXEC systemctl --no-reload disable --now "${j##*/}"
 				# Remove if not attached to any DEB package, else mask
 				if dpkg -S "$j" &> /dev/null
 				then
-					G_EXEC systemctl mask "${j##*/}"
+					G_EXEC systemctl --no-reload mask "${j##*/}"
 				else
 					[[ -e $j || -L $j ]] && G_EXEC rm -R "$j"
 				fi
@@ -1987,13 +1988,13 @@ _EOF_'
 		G_DIETPI-NOTIFY 2 'Configuring DNS nameserver:'
 		# Failsafe: Assure that /etc/resolv.conf is not a symlink and disable systemd-resolved + systemd-networkd
 		# - Since Bookworm, systemd-resolved is an own package.
-		G_EXEC systemctl disable --now systemd-networkd
-		(( $G_DISTRO > 6 )) || G_EXEC systemctl disable --now systemd-resolved
+		G_EXEC systemctl --no-reload disable --now systemd-networkd
+		(( $G_DISTRO > 6 )) || G_EXEC systemctl --no-reload disable --now systemd-resolved
 		G_EXEC rm -f /etc/resolv.conf
 		G_EXEC eval 'echo '\''nameserver 9.9.9.9'\'' > /etc/resolv.conf' # Apply generic functional DNS nameserver
 
 		# ifupdown starts the daemon outside of systemd, the enabled systemd unit just throws an error on boot due to missing dbus and with dbus might interfere with ifupdown
-		systemctl -q is-enabled wpa_supplicant 2> /dev/null && G_EXEC systemctl disable wpa_supplicant
+		systemctl -q is-enabled wpa_supplicant 2> /dev/null && G_EXEC systemctl --no-reload disable wpa_supplicant
 
 		# Removing all network configs: https://github.com/MichaIng/DietPi/issues/6067
 		G_EXEC rm -Rf /etc/network/interfaces{,.d/{,.??,.[^.]}*}
@@ -2036,7 +2037,7 @@ _EOF_'
 		if command -v e2scrub > /dev/null
 		then
 			G_DIETPI-NOTIFY 2 'Disabling e2scrub services which are for LVM and require lvm2/lvcreate being installed'
-			G_EXEC systemctl disable --now e2scrub_{all.timer,reap}
+			G_EXEC systemctl --no-reload disable --now e2scrub_{all.timer,reap}
 		fi
 
 		G_DIETPI-NOTIFY 2 'Enabling weekly TRIM'
@@ -2114,9 +2115,9 @@ _EOF_'
 			/boot/dietpi/func/dietpi-set_hardware serialconsole enable serial0
 			# Disable and mask the others explicitly to be independent of currently available serial devices
 			/boot/dietpi/func/dietpi-set_hardware serialconsole disable ttyAMA0
-			G_EXEC systemctl mask serial-getty@ttyAMA0
+			G_EXEC systemctl --no-reload mask serial-getty@ttyAMA0
 			/boot/dietpi/func/dietpi-set_hardware serialconsole disable ttyS0
-			G_EXEC systemctl mask serial-getty@ttyS0
+			G_EXEC systemctl --no-reload mask serial-getty@ttyS0
 
 		# Odroid XU4
 		elif (( $G_HW_MODEL == 11 ))
@@ -2169,23 +2170,23 @@ _EOF_'
 		(( $G_HW_MODEL == 20 || $G_HW_MODEL == 75 || $G_HW_MODEL == 70 )) || G_CONFIG_INJECT 'CONFIG_SERIAL_CONSOLE_ENABLE=' 'CONFIG_SERIAL_CONSOLE_ENABLE=1' /boot/dietpi.txt
 
 		G_DIETPI-NOTIFY 2 'Disabling static login prompts on consoles tty2 to tty6:'
-		G_EXEC systemctl mask --now getty-static
+		G_EXEC systemctl --no-reload mask --now getty-static
 
 		if (( $G_HW_MODEL == 20 ))
 		then
 			G_DIETPI-NOTIFY 2 'Assuring that logind is enabled on VM image for ACPI functionality'
-			G_EXEC systemctl unmask systemd-logind
+			G_EXEC systemctl --no-reload unmask systemd-logind
 		else
 			# - logind features are usually not needed and (aside of automatic getty spawn and ACPI) require the libpam-systemd package.
 			# - It will be unmasked automatically if libpam-systemd got installed during dietpi-software install, e.g. with desktops.
 			G_DIETPI-NOTIFY 2 'Disabling logind by default, usually not needed on physical server systems'
-			G_EXEC systemctl mask --now systemd-logind
+			G_EXEC systemctl --no-reload mask --now systemd-logind
 		fi
 
 		# Assure that console on TTY1 is enabled for automated first run setup, as well on headless SBCs. Disable it for container images, which usually have no virtual consoles but boot on /dev/console, triggering console-getty.service where autologin is enabled as well.
 		if (( $G_HW_MODEL == 75 ))
 		then
-			G_EXEC systemctl disable getty@tty1
+			G_EXEC systemctl --no-reload disable getty@tty1
 		else
 			G_EXEC systemctl enable getty@tty1
 		fi
@@ -2324,15 +2325,15 @@ _EOF_
 			G_CONFIG_INJECT 'CONFIG_NTP_MODE=' 'CONFIG_NTP_MODE=0' /boot/dietpi.txt
 		else
 			(( $G_DISTRO < 7 )) && G_EXEC_DESC='Enable Dropbear autostart' G_EXEC sed --follow-symlinks -i '/NO_START=1/c\NO_START=0' /etc/default/dropbear
-			G_EXEC systemctl unmask dropbear
+			G_EXEC systemctl --no-reload unmask dropbear
 			G_EXEC systemctl enable dropbear
 		fi
 
 		G_DIETPI-NOTIFY 2 'Configuring services'
 		/boot/dietpi/dietpi-services unmask
 		/boot/dietpi/dietpi-services stop
 		/boot/dietpi/dietpi-services enable
-		G_EXEC systemctl disable cron
+		G_EXEC systemctl --no-reload disable cron
 
 		G_DIETPI-NOTIFY 2 'Removing swapfile from image'
 		/boot/dietpi/func/dietpi-set_swapfile 0 /var/swap
@@ -2430,6 +2431,7 @@ _EOF_
 
 		G_EXEC_DESC='Enabling automated partition and file system resize for first boot' G_EXEC systemctl enable dietpi-fs_partition_resize
 		G_EXEC_DESC='Enabling first boot installation process' G_EXEC systemctl enable dietpi-firstboot
+		G_EXEC systemctl --no-reload mask systemd-firstboot
 
 		G_DIETPI-NOTIFY 2 'Clearing lost+found'
 		rm -Rfv /lost+found/{,.??,.[^.]}*

.github/workflows/dietpi-build.yml

@@ -28,10 +28,6 @@ jobs:
         if [ "${{ github.event.inputs.buildargs }}" = 'all' ]
         then
           echo buildargs=[\
-        '"-m 1 -d 7 -e all", "-m 1 -d 8 -e all",'\
-        '"-m 2 -d 7 -e all", "-m 2 -d 8 -e all", "-m 2 -d 9 -e all",'\
-        '"-m 4 -d 7 -e all", "-m 4 -d 8 -e all", "-m 4 -d 9 -e all",'\
-        '"-m 5 -d 7 -e all", "-m 5 -d 8 -e all", "-m 5 -d 9 -e all",'\
         '"-m 10 -d 7", "-m 10 -d 8", "-m 10 -d 9",'\
         '"-m 11 -d 7", "-m 11 -d 8", "-m 11 -d 9",'\
         '"-m 12 -d 7", "-m 12 -d 8", "-m 12 -d 9",'\
@@ -99,7 +95,7 @@ jobs:
         '"-m 87 -d 7", "-m 87 -d 8", "-m 87 -d 9",'\
         '"-m 88 -d 7", "-m 88 -d 8", "-m 88 -d 9",'\
         '"-m 89 -d 7", "-m 89 -d 8", "-m 89 -d 9",'\
-        '"-m 90 -d 7", "-m 90 -d 8", "-m 90 -d 9", "-m 90 -d 8 --rk35xx-mainline",'\
+        '"-m 90 -d 7", "-m 90 -d 8", "-m 90 -d 9",'\
         '"-m 91 -d 7", "-m 91 -d 8", "-m 91 -d 9", "-m 91 -d 8 --rk35xx-mainline",'\
         '"-m 92 -d 7", "-m 92 -d 8", "-m 92 -d 9", "-m 92 -d 8 --rk35xx-mainline",'\
         '"-m 93 -d 7", "-m 93 -d 8", "-m 93 -d 9", "-m 93 -d 8 --rk35xx-mainline",'\

.github/workflows/dietpi-software.bash

@@ -116,6 +116,7 @@ Process_Software()
 			9) aCOMMANDS[i]='node -v';;
 			10) aCOMMANDS[i]='amiberry-lite -h | grep '\''^\$VER: Amiberry-Lite '\';;
 			11) aCOMMANDS[i]='gzdoom -norun | grep '\''^GZDoom version '\';;
+			12) aSERVICES[i]='rustdesksignal rustdeskrelay' aTCP[i]='21115 21116 21117 21118 21119' aUDP[i]='21116';;
 			#16) aSERVICES[i]='microblog-pub' aTCP[i]='8007';; Service enters a CPU-intense internal error loop until it has been configured interactively via "microblog-pub configure", hence it is not enabled and started anymore after install but instead as part of "microblog-pub configure"
 			17) aCOMMANDS[i]='git --version';; # from Bookworm on, the shorthand "-v" is supported
 			#22) QuiteRSS: has no CLI
@@ -425,23 +426,6 @@ G_EXEC eval 'echo '\''infocmp "$TERM" > /dev/null 2>&1 || { echo "[ INFO ] Unsup
 # Enable automated setup
 G_CONFIG_INJECT 'AUTO_SETUP_AUTOMATED=' 'AUTO_SETUP_AUTOMATED=1' rootfs/boot/dietpi.txt
 
-# Workaround for failing systemd services in emulated container: https://gitlab.com/qemu-project/qemu/-/issues/1962, https://github.com/systemd/systemd/issues/31219
-if (( $emulation ))
-then
-	for i in rootfs/lib/systemd/system/*.service
-	do
-		[[ -f $i ]] || continue
-		grep -Eq '^(Load|Import)Credential=' "$i" || continue
-		G_EXEC mkdir "${i/lib/etc}.d"
-		if [[ $DISTRO == 'bullseye' || $DISTRO == 'bookworm' ]]
-		then
-			G_EXEC eval "echo -e '[Service]\nLoadCredential=' > \"${i/lib/etc}.d/dietpi-no-credentials.conf\""
-		else
-			G_EXEC eval "echo -e '[Service]\nImportCredential=' > \"${i/lib/etc}.d/dietpi-no-credentials.conf\""
-		fi
-	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 (( $arch < 3 && $dist > 7 )) && systemctl -q is-active apparmor
 then
@@ -484,17 +468,34 @@ then
 	G_EXEC touch rootfs/mnt/dietpi_userdata/papermc/plugins/Geyser-Spigot.jar
 fi
 
-# Workarounds for QEMU-emulated RISC-V and 32-bit ARM containers
-if (( ( $arch < 3 || $arch == 11 ) && $emulation ))
+# Workarounds for QEMU-emulated containers
+if (( $emulation ))
 then
-	# Failing services as PrivateUsers=true leads to "Failed to set up user namespacing", and AmbientCapabilities to "Failed to apply ambient capabilities (before UID change): Operation not permitted"
-	G_EXEC mkdir rootfs/etc/systemd/system/{redis-server,raspotify,navidrome,homebridge}.service.d
+	# Failing systemd services: https://gitlab.com/qemu-project/qemu/-/issues/1962, https://github.com/systemd/systemd/issues/31219
+	for i in rootfs/lib/systemd/system/*.service
+	do
+		[[ -f $i ]] || continue
+		grep -Eq '^(Import|Load)Credential=' "$i" || continue
+		G_EXEC mkdir "${i/lib/etc}.d"
+		G_EXEC eval "echo -e '[Service]\nImportCredential=\nLoadCredential=' > \"${i/lib/etc}.d/dietpi-no-credentials.conf\""
+	done
+
+	# Failing services as PrivateUsers leads to "Failed to set up user namespacing", and AmbientCapabilities to "Failed to apply ambient capabilities (before UID change): Operation not permitted"
+	G_EXEC mkdir rootfs/etc/systemd/system/{redis-server,raspotify,navidrome,homebridge,mariadb,systemd-logind,apache2,mpd}.service.d
 	G_EXEC eval 'echo -e '\''[Service]\nPrivateUsers=0'\'' > rootfs/etc/systemd/system/redis-server.service.d/dietpi-container.conf'
 	G_EXEC eval 'echo -e '\''[Service]\nPrivateUsers=0'\'' > rootfs/etc/systemd/system/raspotify.service.d/dietpi-container.conf'
 	G_EXEC eval 'echo -e '\''[Service]\nPrivateUsers=0'\'' > rootfs/etc/systemd/system/navidrome.service.d/dietpi-container.conf'
 	G_EXEC eval 'echo -e '\''[Service]\nAmbientCapabilities='\'' > rootfs/etc/systemd/system/homebridge.service.d/dietpi-container.conf'
+	# Forky: ProtectHome/ProtectSystem/PrivateTmp/...: "Failed to set up mount namespacing: Invalid argument": https://github.com/systemd/systemd/issues/39951
+	if (( $dist > 8 ))
+	then
+		G_EXEC eval 'echo -e '\''[Service]\nProtectHome=0\nProtectSystem=0'\'' > rootfs/etc/systemd/system/mariadb.service.d/dietpi-container.conf'
+		G_EXEC eval 'echo -e '\''[Service]\nProtectHome=0\nProtectSystem=0\nPrivateTmp=0\nReadWritePaths=\nProtectKernelModules=0\nProtectControlGroups=0\nProtectKernelLogs=0'\'' > rootfs/etc/systemd/system/systemd-logind.service.d/dietpi-container.conf'
+		G_EXEC eval 'echo -e '\''[Service]\nPrivateTmp=0'\'' > rootfs/etc/systemd/system/apache2.service.d/dietpi-container.conf'
+		G_EXEC eval 'echo -e '\''[Service]\nProtectSystem=0\nProtectKernelTunables=0\nProtectControlGroups=0\nProtectKernelModules=0'\'' > rootfs/etc/systemd/system/mpd.service.d/dietpi-container.conf'
+	fi
 
-	# Failing 32-bit ARM Rust builds on ext4 in QEMU emulated container on 64-bit host: https://github.com/rust-lang/cargo/issues/9545
+	# Failing 32-bit ARM Rust builds on ext4 with 64-bit host: https://github.com/rust-lang/cargo/issues/9545
 	if (( $arch < 3 ))
 	then
 		G_EXEC eval 'echo -e '\''tmpfs /mnt/dietpi_userdata tmpfs size=3G,noatime,lazytime\ntmpfs /root tmpfs size=3G,noatime,lazytime'\'' >> rootfs/etc/fstab'
@@ -529,7 +530,7 @@ then
 	G_EXEC sed --follow-symlinks -i "/# Start DietPi-Software/i\sed -i 's/192\.168\.42\./$(G_GET_NET ip | sed 's/[0-9]*$//')/g' /boot/dietpi/dietpi-software" rootfs/boot/dietpi/dietpi-login
 fi
 
-# Workaround for Apache2 on emulated RISC-V system
+# Workaround for Apache on emulated RISC-V system
 if (( ${aINSTALL[83]} )) && (( $emulation && $arch == 11 ))
 then
 	G_EXEC sed --follow-symlinks -i '/# Start DietPi-Software/i\sed -i '\''/^DocumentRoot/a\Mutex posixsem'\'' /boot/dietpi/dietpi-software' rootfs/boot/dietpi/dietpi-login

.github/workflows/shellcheck.yml

@@ -10,7 +10,7 @@ jobs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login != github.event.pull_request.base.repo.owner.login
     runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Setup DietPi-Globals
       run: |
         sudo mkdir -p /boot/dietpi/func