v9.10

- DietPi-Build | Further adjustment to apt-key workaround, as it has been removed completely in Trixie, and /usr/local/bin seems to not be used by mmdebstrap

.build/images/dietpi-build

@@ -415,11 +415,11 @@ G_EXEC mount -o X-mount.mkdir -t tmpfs tmpfs rootfs/run
 G_EXEC mount -o X-mount.mkdir -t tmpfs tmpfs rootfs/var/cache/apt
 G_EXEC mount -o X-mount.mkdir -t tmpfs tmpfs rootfs/var/lib/apt/lists
 G_EXEC mount -o X-mount.mkdir -t tmpfs tmpfs rootfs/var/log
-# Workaround for apt-key dependency loop on Raspbian Trixie
+# Workaround for missing apt-key on Trixie, used by raspbian-archive-keyring
 if (( $HW_ARCH == 1 && $DISTRO == 8 ))
 then
-	G_EXEC mkdir -p rootfs/usr/local/bin
-	G_EXEC ln -s /bin/true rootfs/usr/local/bin/apt-key
+	G_EXEC mkdir -p rootfs/usr/bin
+	G_EXEC ln -s true rootfs/usr/bin/apt-key
 fi
 packages='apt,bash-completion,bzip2,ca-certificates,cron,curl,fdisk,gpg,htop,iputils-ping,locales,mawk,nano,parted,procps,psmisc,sudo,systemd-sysv,tzdata,udev,unzip,wget,whiptail,'
 (( $DISTRO > 7 )) && packages+='7zip,' || packages+='p7zip,'
@@ -429,11 +429,10 @@ packages='apt,bash-completion,bzip2,ca-certificates,cron,curl,fdisk,gpg,htop,ipu
 # - Bullseye/Jammy host mmdebstrap does not support "--skip=check/empty,check/qemu".
 G_EXEC_OUTPUT=1 G_EXEC mmdebstrap --mode=root --format=dir --skip=check/empty --skip=check/qemu --variant=minbase --include="$packages" --arch="$parch" --keyring="$keyring" "$distro" ./rootfs "$repo"
 G_EXEC umount rootfs/dev rootfs/run rootfs/var/cache/apt rootfs/var/lib/apt/lists rootfs/var/log
-# Undo workaround for apt-key dependency loop on Raspbian Trixie
+# Undo workaround for missing apt-key on Trixie, used by raspbian-archive-keyring
 if (( $HW_ARCH == 1 && $DISTRO == 8 ))
 then
-	G_EXEC rm rootfs/usr/local/bin/apt-key
-	G_EXEC rmdir -p rootfs/usr/local/bin
+	G_EXEC rm rootfs/usr/bin/apt-key
 fi
 ##########################################
 # DietPi-Installer