Beta v9.10.0

.build/images/U-Boot/boot.cmd

@@ -28,7 +28,7 @@ fi
 setenv bootargs "root=${rootdev} rootfstype=${rootfstype} rootwait ${consoleargs} consoleblank=0 coherent_pool=2M usb-storage.quirks=${usbstoragequirks} ${extraargs}"
 
 # Add bootargs for Docker
-if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=memory swapaccount=1"; fi
+if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=memory"; fi
 
 # Load kernel, initramfs and device tree
 load "${devtype}" "${devnum}" "${kernel_addr_r}" "${prefix}Image"

.build/images/dietpi-installer

@@ -1142,7 +1142,7 @@ _EOF_
 				83) model='orangepizero3' kernel='sunxi64';;
 				85) model='rock-5a' kernel='rk35xx' branch='vendor';;
 				86) model='tinkerboard-2' kernel='rockchip64';;
-				87) model='orangepi3b' kernel='rockchip64' branch='edge';;
+				87) model='orangepi3b' kernel='rockchip64';;
 				88) model='orangepizero2w' kernel='sunxi64';;
 				89) model='orangepi3-lts' kernel='sunxi64';;
 				90) model='radxa-zero3' kernel='rk35xx' branch='legacy';;

.build/software/Amiberry/container_build.bash

@@ -60,7 +60,7 @@ case $PLATFORM in
 	'rpi'[345]'-64-'*|'AMLSM1'|'n2'|'a64'|'rk3588') image="ARMv8-${DISTRO^}" arch=3;;
 	'rpi'[2-5]*|'c1'|'xu4'|'RK3288'|'sun8i'|'s812') image="ARMv7-${DISTRO^}" arch=2;;
 	'x86-64') image="x86_64-${DISTRO^}" arch=10;;
-	'riscv64') image='RISC-V-Sid' arch=11;;
+	'riscv64') image="RISC-V-${DISTRO^}" arch=11;;
 	*) Error_Exit "Invalid platform \"$PLATFORM\" passed";;
 esac
 image="DietPi_Container-$image.img"
@@ -119,24 +119,15 @@ G_EXEC mount "${FP_LOOP}p1" rootfs
 
 # Enable automated setup
 G_CONFIG_INJECT 'AUTO_SETUP_AUTOMATED=' 'AUTO_SETUP_AUTOMATED=1' rootfs/boot/dietpi.txt
-# - Workaround for skipped autologin in emulated Trixie/Sid containers: https://gitlab.com/qemu-project/qemu/-/issues/1962
+# - Workaround for failing systemd services and hence missing autologin in emulated Trixie containers: https://gitlab.com/qemu-project/qemu/-/issues/1962, https://github.com/systemd/systemd/issues/31219
 if [[ $DISTRO == 'trixie' ]] && (( $G_HW_ARCH != $arch && ( $G_HW_ARCH > 9 || $G_HW_ARCH < $arch ) ))
 then
-	cat << '_EOF_' > rootfs/etc/systemd/system/dietpi-automation.service
-[Unit]
-Description=DietPi-Automation
-After=dietpi-postboot.service
-
-[Service]
-Type=idle
-StandardOutput=tty
-ExecStart=/bin/dash -c 'infocmp "$TERM" > /dev/null 2>&1 || { echo "[ WARN ] Unsupported TERM=\"$TERM\", switching to TERM=\"dumb\""; export TERM=dumb; }; exec /boot/dietpi/dietpi-login'
-ExecStop=/sbin/poweroff
-
-[Install]
-WantedBy=multi-user.target
-_EOF_
-	G_EXEC ln -s /etc/systemd/system/dietpi-automation.service rootfs/etc/systemd/system/multi-user.target.wants/
+	for i in rootfs/usr/lib/systemd/system/*.service
+	do
+		grep -q '^ImportCredential=' "$i" || continue
+		G_EXEC mkdir "${i/usr\/lib/etc}.d"
+		G_EXEC eval "echo -e '[Service]\nImportCredential=' > ${i/usr\/lib/etc}.d/dietpi-no-ImportCredential.conf"
+	done
 fi
 
 # Workaround invalid TERM on login
@@ -147,7 +138,7 @@ G_EXEC eval 'echo '\''infocmp "$TERM" > /dev/null 2>&1 || { echo "[ WARN ] Unsup
 G_CONFIG_INJECT 'CONFIG_CHECK_CONNECTION_IP=' 'CONFIG_CHECK_CONNECTION_IP=127.0.0.1' rootfs/boot/dietpi.txt
 
 # Shutdown on failures before the custom script is executed
-G_EXEC sed --follow-symlinks -i 's|Prompt_on_Failure$|{ journalctl -n 50; ss -tulpn; df -h; free -h; poweroff; }|' rootfs/boot/dietpi/dietpi-login
+G_EXEC sed --follow-symlinks -i 's|Prompt_on_Failure$|{ journalctl -n 50; ss -tulpn; df -h; free -h; systemctl start poweroff.target; }|' rootfs/boot/dietpi/dietpi-login
 
 # Avoid DietPi-Survey uploads to not mess with the statistics
 G_EXEC rm rootfs/root/.ssh/known_hosts
@@ -172,7 +163,7 @@ cat << _EOF_ >> rootfs/boot/Automation_Custom_Script.sh || Error_Exit 'Failed to
 echo '[ INFO ] Running Amiberry build script ...'
 bash -c "\$(curl -sSf 'https://raw.githubusercontent.com/$G_GITOWNER/DietPi/$G_GITBRANCH/.build/software/Amiberry/build.bash')" -- '$PLATFORM'
 mv -v '/tmp/amiberry_$PLATFORM.deb' /
-poweroff
+systemctl start poweroff.target
 _EOF_
 
 ##########################################

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

@@ -64,7 +64,7 @@ case $ARCH in
 	'armv7l') image="ARMv7-${DISTRO^}" arch=2;;
 	'aarch64') image="ARMv8-${DISTRO^}" arch=3;;
 	'x86_64') image="x86_64-${DISTRO^}" arch=10;;
-	'riscv64') image='RISC-V-Sid' arch=11; [[ $DISTRO == 'trixie' ]] || Error_Exit "Invalid distro \"$DISTRO\" for arch \"$ARCH\" passed, only \"trixie\" is supported";;
+	'riscv64') image="RISC-V-${DISTRO^}" arch=11; [[ $DISTRO == 'trixie' ]] || Error_Exit "Invalid distro \"$DISTRO\" for arch \"$ARCH\" passed, only \"trixie\" is supported";;
 	*) Error_Exit "Invalid architecture \"$ARCH\" passed";;
 esac
 image="DietPi_Container-$image.img"
@@ -123,24 +123,15 @@ G_EXEC mount "${FP_LOOP}p1" rootfs
 
 # Enable automated setup
 G_CONFIG_INJECT 'AUTO_SETUP_AUTOMATED=' 'AUTO_SETUP_AUTOMATED=1' rootfs/boot/dietpi.txt
-# - Workaround for skipped autologin in emulated Trixie/Sid containers: https://gitlab.com/qemu-project/qemu/-/issues/1962
+# - Workaround for failing systemd services and hence missing autologin in emulated Trixie containers: https://gitlab.com/qemu-project/qemu/-/issues/1962, https://github.com/systemd/systemd/issues/31219
 if [[ $DISTRO == 'trixie' ]] && (( $G_HW_ARCH != $arch && ( $G_HW_ARCH > 9 || $G_HW_ARCH < $arch ) ))
 then
-	cat << '_EOF_' > rootfs/etc/systemd/system/dietpi-automation.service
-[Unit]
-Description=DietPi-Automation
-After=dietpi-postboot.service
-
-[Service]
-Type=idle
-StandardOutput=tty
-ExecStart=/bin/dash -c 'infocmp "$TERM" > /dev/null 2>&1 || { echo "[ WARN ] Unsupported TERM=\"$TERM\", switching to TERM=\"dumb\""; export TERM=dumb; }; exec /boot/dietpi/dietpi-login'
-ExecStop=/sbin/poweroff
-
-[Install]
-WantedBy=multi-user.target
-_EOF_
-	G_EXEC ln -s /etc/systemd/system/dietpi-automation.service rootfs/etc/systemd/system/multi-user.target.wants/
+	for i in rootfs/usr/lib/systemd/system/*.service
+	do
+		grep -q '^ImportCredential=' "$i" || continue
+		G_EXEC mkdir "${i/usr\/lib/etc}.d"
+		G_EXEC eval "echo -e '[Service]\nImportCredential=' > ${i/usr\/lib/etc}.d/dietpi-no-ImportCredential.conf"
+	done
 fi
 
 # Install Go for Gogs
@@ -154,21 +145,18 @@ G_EXEC eval 'echo '\''infocmp "$TERM" > /dev/null 2>&1 || { echo "[ WARN ] Unsup
 G_CONFIG_INJECT 'CONFIG_CHECK_CONNECTION_IP=' 'CONFIG_CHECK_CONNECTION_IP=127.0.0.1' rootfs/boot/dietpi.txt
 
 # Shutdown on failures before the custom script is executed
-G_EXEC sed --follow-symlinks -i 's|Prompt_on_Failure$|{ journalctl -n 50; ss -tulpn; df -h; free -h; poweroff; }|' rootfs/boot/dietpi/dietpi-login
+G_EXEC sed --follow-symlinks -i 's|Prompt_on_Failure$|{ journalctl -n 50; ss -tulpn; df -h; free -h; systemctl start poweroff.target; }|' rootfs/boot/dietpi/dietpi-login
 
 # Avoid DietPi-Survey uploads to not mess with the statistics
 G_EXEC rm rootfs/root/.ssh/known_hosts
 
-# ARMv6/7 Trixie: Temporarily prevent dist-upgrade on Trixie, as it fails due to 64-bit time_t transition causing dependency conflicts across the repo.
-(( $arch < 3 )) && [[ $DISTRO == 'trixie' ]] && G_EXEC touch rootfs/boot/dietpi/.skip_distro_upgrade
-
 # Automated build
 cat << _EOF_ > rootfs/boot/Automation_Custom_Script.sh || Error_Exit 'Failed to generate Automation_Custom_Script.sh'
 #!/bin/dash
 echo '[ INFO ] Running $NAME build script ...'
 bash -c "\$(curl -sSf 'https://raw.githubusercontent.com/$G_GITOWNER/DietPi/$G_GITBRANCH/.build/software/$NAME/build.bash')"
 mkdir -v /output && mv -v /tmp/*.$EXT /output
-poweroff
+systemctl start poweroff.target
 _EOF_
 
 ##########################################

.build/software/shairport-sync/build.bash

@@ -7,15 +7,12 @@
 # -------------------------
 
 # Build deps
-# - Workaround for CI on Buster: Mask Avahi daemon service, since it can fail to start, failing the package install
-(( $G_DISTRO == 5 )) && G_EXEC systemctl mask avahi-daemon
 G_AGUP
 G_AGDUG automake pkg-config make g++ libpopt-dev libconfig-dev libssl-dev libsoxr-dev libavahi-client-dev libasound2-dev libglib2.0-dev libmosquitto-dev avahi-daemon git libplist-dev libsodium-dev libgcrypt20-dev libavformat-dev xxd
-(( $G_DISTRO == 5 )) && G_EXEC systemctl unmask avahi-daemon
 adeps=('libc6' 'libasound2' 'libavahi-client3' 'libsoxr0' 'libconfig9' 'libpopt0' 'libglib2.0-0' 'libmosquitto1' 'avahi-daemon')
 adeps2=('libsodium23' 'libgcrypt20')
 case $G_DISTRO in
-	5|6) adeps+=('libssl1.1'); adeps2+=('libavcodec58' 'libplist3');;
+	6) adeps+=('libssl1.1'); adeps2+=('libavcodec58' 'libplist3');;
 	7) adeps+=('libssl3'); adeps2+=('libavcodec59' 'libplist3');;
 	8) adeps+=('libssl3'); adeps2+=('libavcodec61' 'libplist-2.0-4');;
 	*) G_DIETPI-NOTIFY 1 "Unsupported distro version: $G_DISTRO_NAME (ID=$G_DISTRO)"; exit 1;;
@@ -202,7 +199,7 @@ alsa =
 //	output_rate = "auto"; // can be "auto", 44100, 88200, 176400 or 352800, but the device must have the capability.
 //	output_format = "auto"; // can be "auto", "U8", "S8", "S16", "S16_LE", "S16_BE", "S24", "S24_LE", "S24_BE", "S24_3LE", "S24_3BE", "S32", "S32_LE" or "S32_BE" but the device must have the capability. Except where stated using (*LE or *BE), endianness matches that of the processor.
 
-//	disable_synchronization = "no"; // Set to "yes" to disable synchronization. Default is "no" This is really meant for troubleshootingG.
+//	disable_synchronization = "no"; // Set to "yes" to disable synchronization. Default is "no" This is really meant for troubleshooting.
 
 //	period_size = <number>; // Use this optional advanced setting to set the alsa period size near to this value
 //	buffer_size = <number>; // Use this optional advanced setting to set the alsa buffer size near to this value

.build/software/vaultwarden/build.bash

@@ -22,7 +22,6 @@ G_DIETPI-NOTIFY 2 'Installing Rust via rustup'
 grep -q '^ID=raspbian' /etc/os-release && G_HW_ARCH_NAME='armv6l' host=('--default-host' 'arm-unknown-linux-gnueabihf') || host=()
 # - ARMv7: Apply workaround for failing crates index update in in emulated 32-bit ARM environments: https://github.com/rust-lang/cargo/issues/8719. CARGO_REGISTRIES_CRATES_IO_PROTOCOL='sparse' does not solve everything: https://github.com/rust-lang/cargo/issues/8719#issuecomment-1928540617
 # - ARMv8: Apply workaround for increased cargo fetch RAM usage: https://github.com/rust-lang/cargo/issues/10583
-# - Trixie: Set missing HOME, since the script runs from a systemd unit without login shell and hence no HOME set.
 export HOME=$(mktemp -d) CARGO_NET_GIT_FETCH_WITH_CLI='true'
 G_EXEC cd "$HOME"
 G_EXEC curl -sSfo rustup-init.sh 'https://sh.rustup.rs'
@@ -35,6 +34,14 @@ export PATH="$HOME/.cargo/bin:$PATH"
 # - vaultwarden
 version=$(curl -sSf 'https://api.github.com/repos/dani-garcia/vaultwarden/releases/latest' | mawk -F\" '/^ *"tag_name": "[^"]*",$/{print $4}')
 [[ $version ]] || { G_DIETPI-NOTIFY 1 'No latest vaultwarden version found, aborting ...'; exit 1; }
+# - Obtain version suffix
+G_EXEC curl -sSfo package.deb "https://dietpi.com/downloads/binaries/$G_DISTRO_NAME/vaultwarden_$G_HW_ARCH_NAME.deb"
+old_version=$(dpkg-deb -f package.deb Version) || exit 1
+G_EXEC rm package.deb
+suffix=${old_version#*-dietpi}
+[[ $old_version == "$version-"* ]] && pkg_version="$version-dietpi$((suffix+1))" || pkg_version+="$version-dietpi1"
+# - Env var to show version in web UI: https://github.com/MichaIng/DietPi/issues/7364
+export VW_VERSION=$pkg_version
 # - web vault
 wv_url=$(curl -sSf 'https://api.github.com/repos/dani-garcia/bw_web_builds/releases/latest' | mawk -F\" '/^ *"browser_download_url": ".*\.tar\.gz"$/{print $4}')
 [[ $wv_url ]] || { G_DIETPI-NOTIFY 1 'No latest web vault version found, aborting ...'; exit 1; }
@@ -214,17 +221,10 @@ DEPS_APT_VERSIONED=${DEPS_APT_VERSIONED%,}
 # shellcheck disable=SC2001
 [[ $G_HW_ARCH_NAME == 'armv6l' ]] && DEPS_APT_VERSIONED=$(sed 's/+rp[it][0-9]\+[^)]*)/)/g' <<< "$DEPS_APT_VERSIONED") || DEPS_APT_VERSIONED=$(sed 's/+b[0-9]\+)/)/g' <<< "$DEPS_APT_VERSIONED")
 
-# - Obtain version suffix
-G_EXEC curl -sSfo package.deb "https://dietpi.com/downloads/binaries/$G_DISTRO_NAME/vaultwarden_$G_HW_ARCH_NAME.deb"
-old_version=$(dpkg-deb -f package.deb Version)
-G_EXEC rm package.deb
-suffix=${old_version#*-dietpi}
-[[ $old_version == "$version-"* ]] && version+="-dietpi$((suffix+1))" || version+="-dietpi1"
-
 # - control
 cat << _EOF_ > "$DIR/DEBIAN/control"
 Package: vaultwarden
-Version: $version
+Version: $pkg_version
 Architecture: $(dpkg --print-architecture)
 Maintainer: MichaIng <micha@dietpi.com>
 Date: $(date -uR)

.github/workflows/armbian.yml

@@ -11,7 +11,7 @@ on:
       branch:
         description: 'Branch'
         type: choice
-        options: [legacy, current, edge, vendor, collabora]
+        options: [legacy, vendor, current, edge]
         default: current
         required: true
       board:
@@ -66,6 +66,11 @@ jobs:
             git fetch origin main
             git rebase origin/main
         fi
+        # Workaround for onboard WiFi on Orange Pi 5 Max
+        if [ '${{ github.event.inputs.board }}' = 'orangepi5-max' ] && [ '${{ github.event.inputs.asset }}' = 'kernel' ] && [ '${{ github.event.inputs.gitbranch }}' != 'orangepi5max' ]
+        then
+            git cherry-pick origin/orangepi5max || git cherry-pick dietpi/orangepi5max
+        fi
     - name: Obtain version suffix
       run: |
         cd build
@@ -82,6 +87,10 @@ jobs:
             ;;
             *) echo 'ERROR: Invalid asset "${{ github.event.inputs.asset }}"'; exit 1;;
         esac
+        if [ '${{ github.event.inputs.board }}' = 'orangepi5-max' ] && [ '${{ github.event.inputs.asset }}' = 'kernel' ]
+        then
+            package="${package}_orangepi5max"
+        fi
         if curl -fO "https://dietpi.com/downloads/binaries/$package.deb"
         then
             cur_version=$(dpkg-deb -f "$package.deb" Version)
@@ -111,8 +120,14 @@ jobs:
         cd build/output/debs
         for i in *
         do
-          mv -v "$i" "${i%%_*}.deb"
-          i="${i%%_*}.deb"
+          if [ '${{ github.event.inputs.board }}' = 'orangepi5-max' ] && [ '${{ github.event.inputs.asset }}' = 'kernel' ]
+          then
+              mv -v "$i" "${i%%_*}_orangepi5max.deb"
+              i="${i%%_*}_orangepi5max.deb"
+          else
+              mv -v "$i" "${i%%_*}.deb"
+              i="${i%%_*}.deb"
+          fi
           files="$files,$i"
           urls="$urls,\"https://dietpi.com/downloads/binaries/testing/$i\""
         done

.github/workflows/dietpi-build.yml

@@ -34,9 +34,9 @@ jobs:
         '"-m 15 -d 6", "-m 15 -d 7", "-m 15 -d 8", '\
         '"-m 16 -d 6", "-m 16 -d 7", "-m 16 -d 8", '\
         '"-m 20 -d 6 -v all", "-m 20 -d 7 -v all", "-m 20 -d 8 -v all", '\
-        '"-m 21 -d 6", "-m 21 -d 7", "-m 21 -d 8", '\
-        '"-m 21 -d 6 -i", "-m 21 -d 7 -i", "-m 21 -d 8 -i", '\
-        '"-m 21 -d 6 -p gpt", "-m 21 -d 7 -p gpt", "-m 21 -d 8 -p gpt", '\
+        '"-m 20 -d 6 -v all -g gpt", "-m 20 -d 7 -g gpt -v all", "-m 20 -d 8 -g gpt -v all", '\
+        '"-m 21 -d 6 -v all", "-m 21 -d 7 -v all", "-m 21 -d 8 -v all", '\
+        '"-m 21 -d 6 -v all -g gpt", "-m 21 -d 7 -g gpt -v all", "-m 21 -d 8 -g gpt -v all", '\
         '"-m 40 -d 6", "-m 40 -d 7", "-m 40 -d 8", '\
         '"-m 42 -d 6", "-m 42 -d 7", "-m 42 -d 8", '\
         '"-m 43 -d 6", "-m 43 -d 7", "-m 43 -d 8", '\

.github/workflows/dietpi-software-build.yml

@@ -67,7 +67,6 @@ jobs:
         exclude:
         - { arch: riscv64, dist: bullseye }
         - { arch: riscv64, dist: bookworm }
-        - { arch: armv7l, name: gogs }
         - { arch: aarch64, name: gogs }
         - { arch: x86_64, name: gogs }
       fail-fast: false