Release v7.9

.conf/desktop/apps/dietpi-justboom.desktop

@@ -2,7 +2,7 @@
 Version=1.0
 Name=DietPi-JustBoom
 Type=Application
-Comment=Tweak audio options for your JustBoom (and others) soundcard
+Comment=Tweak your sound card, MPD and CAVA settings
 Terminal=true
 Exec=/boot/dietpi/misc/dietpi-justboom
 Icon=/var/lib/dietpi/dietpi-software/installed/desktop/icons/justboom.png

.conf/dps_182/unbound.conf

@@ -47,7 +47,6 @@ server:
 	do-tcp: yes
 	do-ip4: yes
 	do-ip6: yes
-	prefer-ip6: no
 
 	# DNS root server information file. Updated monthly via cron job: /etc/cron.monthly/dietpi-unbound
 	root-hints: "/var/lib/unbound/root.hints"

.meta/dietpi-build

@@ -37,24 +37,26 @@ done
 
 # Check for valid target hardware model and set variables accordingly
 WIFI_REQUIRED=1
-partition_start=4
+partition_start=1
 efi_size=64
-boot_size=128
-root_size=892
+boot_size=0
+root_size=1023
 CLONING_TOOL='dd'
 case $HW_MODEL in
-	0) iname='RPi';;
-	20) iname='VM' WIFI_REQUIRED=0 boot_size=0;;
-	21) iname='NativePC-BIOS' HW_ARCH=10 root_size=1152;;
+	0) iname='RPi' partition_start=4 boot_size=128 root_size=892;;
+	20) iname='VM' WIFI_REQUIRED=0;;
+	21) iname='NativePC-BIOS' HW_ARCH=10 root_size=1215;;
 	*) G_DIETPI-NOTIFY 1 "Invalid hardware model \"$HW_MODEL\" passed, aborting..."; exit 1;;
 esac
 
 # Check for valid target architecture and set variables accordingly
+repo='https://deb.debian.org/debian/'
+keyring='/usr/share/keyrings/debian-archive-keyring.gpg'
 case $HW_ARCH in
-	1) iarch='ARMv6' parch='armhf' repo='http://raspbian.raspberrypi.org/raspbian/';;
-	2) iarch='ARMv7' parch='armhf' repo='https://deb.debian.org/debian/';;
-	3) iarch='ARMv8' parch='arm64' repo='https://deb.debian.org/debian/';;
-	10) iarch='x86_64' parch='amd64' repo='https://deb.debian.org/debian/' partition_start=1;;
+	1) iarch='ARMv6' parch='armhf' repo='http://raspbian.raspberrypi.org/raspbian/' keyring='/usr/share/keyrings/raspbian-archive-keyring.gpg';;
+	2) iarch='ARMv7' parch='armhf';;
+	3) iarch='ARMv8' parch='arm64';;
+	10) iarch='x86_64' parch='amd64';;
 	*) G_DIETPI-NOTIFY 1 "Invalid architecture \"$HW_ARCH\" passed, aborting..."; exit 1;;
 esac
 
@@ -86,15 +88,15 @@ G_EXEC fallocate -l "$((partition_start+efi_size+boot_size+root_size))M" "$OUTPU
 if [[ $PTTYPE == 'gpt' ]]
 then
 	G_EXEC parted -s "$OUTPUT_IMG_NAME.img" unit MiB mklabel gpt mkpart 'EFI' fat32 $partition_start $((partition_start+efi_size)) set 1 esp on
-	# Create boot partition it set
+	# Create boot partition if set
 	(( $boot_size )) && G_EXEC parted -s "$OUTPUT_IMG_NAME.img" unit MiB mkpart 'boot' fat32 $((partition_start+efi_size)) $((partition_start+efi_size+boot_size))
 	# root partition
 	G_EXEC parted -s "$OUTPUT_IMG_NAME.img" unit MiB mkpart 'root' "$FSTYPE" $((partition_start+efi_size+boot_size)) 100%
 
 # MBR: Set partition types instead of labels
 else
 	G_EXEC parted -s "$OUTPUT_IMG_NAME.img" unit MiB mklabel msdos
-	# Create boot partition it set
+	# Create boot partition if set
 	(( $boot_size )) && G_EXEC parted -s "$OUTPUT_IMG_NAME.img" unit MiB mkpart primary fat32 $((partition_start)) $((partition_start+boot_size))
 	# root partition
 	G_EXEC parted -s "$OUTPUT_IMG_NAME.img" unit MiB mkpart primary "$FSTYPE" $((partition_start+boot_size)) 100%
@@ -200,7 +202,7 @@ exit 0
 _EOF_
 
 # Bootstrap
-G_EXEC_OUTPUT=1 G_EXEC debootstrap --arch="$parch" --variant=minbase --exclude='gcc-7-base,gcc-8-base,gcc-9-base' --include='bash-completion,bzip2,ca-certificates,console-setup,cron,curl,dropbear,ethtool,fake-hwclock,fdisk,gnupg,htop,ifupdown,isc-dhcp-client,kmod,locales,nano,p7zip,parted,procps,psmisc,rfkill,sudo,systemd-sysv,systemd-timesyncd,tzdata,udev,unzip,usbutils,wget,whiptail' bullseye ./rootfs "$repo"
+G_EXEC_OUTPUT=1 G_EXEC debootstrap --variant=minbase --exclude='gcc-7-base,gcc-8-base,gcc-9-base' --include='bash-completion,bzip2,ca-certificates,console-setup,cron,curl,dropbear,ethtool,fake-hwclock,fdisk,gnupg,htop,ifupdown,isc-dhcp-client,kmod,locales,nano,p7zip,parted,procps,psmisc,rfkill,sudo,systemd-sysv,systemd-timesyncd,tzdata,udev,unzip,usbutils,wget,whiptail' --arch="$parch" --keyring="$keyring" bullseye ./rootfs "$repo"
 
 # Remove cached archives and list files created by debootstrap
 G_EXEC rm -Rf rootfs/var/{cache/apt,lib/apt/lists}/*
@@ -215,11 +217,10 @@ then
 	G_EXEC systemctl start dbus.socket dbus
 fi
 # - Bind mounts required to allow container reading its own drive info, /dev/disk for GRUB and probably other tools to detect UUIDs
-# - CAP_IPC_LOCK required for mlock/mlockall, used by vmtouch
 abind=()
 [[ -b '/dev/loop0p2' ]] && abind=('--bind=/dev/loop0p2')
 [[ -b '/dev/loop0p3' ]] && abind+=('--bind=/dev/loop0p3')
-systemd-nspawn -bD rootfs --bind=/dev/loop0 --bind=/dev/loop0p1 "${abind[@]}" --bind=/dev/disk --capability=CAP_IPC_LOCK || exit 1
+systemd-nspawn -bD rootfs --bind=/dev/loop0 --bind=/dev/loop0p1 "${abind[@]}" --bind=/dev/disk || exit 1
 [[ -f 'rootfs/success' ]] || { G_DIETPI-NOTIFY 1 'The container setup did not finish successfully, aborting...'; exit 1; }
 G_EXEC rm rootfs/success
 G_EXEC sync
@@ -233,8 +234,5 @@ G_EXEC losetup -d /dev/loop0
 export FP_ROOT_DEV CLONING_TOOL OUTPUT_IMG_NAME MOUNT_IT='Off'
 bash -c "$(curl -sSfL "https://raw.githubusercontent.com/$G_GITOWNER/DietPi/$G_GITBRANCH/.meta/dietpi-imager")" 'DietPi-Imager' "$OUTPUT_IMG_NAME.img" || exit 1
 
-# Upload
-[[ -x 'upload.sh' ]] && ./upload.sh "$OUTPUT_IMG_NAME.7z"
-
 exit 0
 }

.meta/dietpi-imager

@@ -345,8 +345,12 @@
 		then
 			# Disable and enable journal to clear it and allow further size reduction
 			G_EXEC tune2fs -O '^has_journal' "$FP_ROOT_DEV"
+			G_EXEC sync
+			G_EXEC sleep 1
 			G_EXEC tune2fs -O 'has_journal' "$FP_ROOT_DEV"
-
+			G_EXEC sync
+			G_EXEC sleep 1
+
 			# Run multiple times until no change is done any more
 			G_DIETPI-NOTIFY 2 'Shrinking root filesystem to minimum size...'
 			local out

.meta/dietpi-survey_report

@@ -265,7 +265,7 @@ shopt -s extglob
 		[80]='Ubooquity'
 		[81]='LLSP'
 		[82]='LLMP'
-		[83]='Apache2'
+		[83]='Apache'
 		[84]='Lighttpd'
 		[85]='Nginx'
 		[86]='Roon Extension Manager'
@@ -577,8 +577,15 @@ shopt -s extglob
 	unset -v 'aSOFTWARE_NAME7_8[99]' # emonHub
 	aSOFTWARE_NAME7_8[200]='DietPi-Dashboard'
 
+	# v7.9
+	aSOFTWARE_NAME7_9=()
+	for i in "${!aSOFTWARE_NAME7_8[@]}"
+	do
+		aSOFTWARE_NAME7_9[$i]=${aSOFTWARE_NAME7_8[$i]}
+	done
+
 	# Pre-create software counter array so that we can see also software (available in newest version) with 0 installs
-	for i in "${aSOFTWARE_NAME7_8[@]}"
+	for i in "${aSOFTWARE_NAME7_9[@]}"
 	do
 		aSOFTWARE["$i"]=0
 	done
@@ -1232,12 +1239,17 @@ _EOF_
 		# Move HTML page in place
 		mv index.html /var/www/survey/index.html
 
+		# Get current total system count and calculate new system count
+		local total=$(influx -database 'survey' -execute 'select total from systems order by desc limit 1' | mawk 'END{print $2}')
+		local new=$(( $SURVEY_COUNT_TOTAL - $total + $SURVEY_COUNT_INACTIVE - $SURVEY_COUNT_REACTIVE ))
+
 		# Create InfluxDB query
 		query=("insert systems total=$SURVEY_COUNT_TOTAL")
 		query+=("insert systems optin=$SURVEY_COUNT_OPTIN")
 		query+=("insert systems optout=$SURVEY_COUNT_OPTOUT")
 		query+=("insert systems inactive=$SURVEY_COUNT_INACTIVE")
 		query+=("insert systems reactive=$SURVEY_COUNT_REACTIVE")
+		query+=("insert systems new=$new")
 		for i in "${!aDIETPI_VERSION[@]}"
 		do
 			query+=("insert version $i=${aDIETPI_VERSION[$i]}")

.update/patches

@@ -543,7 +543,10 @@ Patch_7_8()
 \nNew DietPi-Backup log files are now created within the chosen backup directory. The existing old log is moved from /var/log/dietpi-backup.log to /tmp/dietpi-backup.log in case you need to review it.'
 		G_EXEC mv /{var/log,tmp}/dietpi-backup.log
 	fi
+}
 
+Patch_7_9()
+{
 	# On Raspberry Pi, for backwards compatibility with software compiled against older libraspberrypi0, create symlinks from old to new filenames
 	if (( $G_HW_MODEL < 10 && $G_HW_ARCH < 3 )) && dpkg-query -s 'libraspberrypi0' &> /dev/null
 	then
@@ -557,6 +560,21 @@ Patch_7_8()
 
 		done < <(dpkg -L 'libraspberrypi0' | grep '^/usr/lib/arm-linux-gnueabihf/.*\.so.0$')
 	fi
+
+	# Update choice and preference index variables
+	[[ -f '/boot/dietpi/.installed' ]] && G_EXEC sed -Ei -e 's/INDEX_(LOGGING|WEBSERVER|DESKTOP|BROWSER)_CURRENT/INDEX_\1/g' -e '/INDEX_(LOGGING|WEBSERVER|DESKTOP|BROWSER|SSHSERVER|FILESERVER)_TARGET/d' -e '/INDEX_(SSHSERVER|FILESERVER)_CURRENT/d' /boot/dietpi/.installed
+
+	# Offer to update DietPi-Dashboard TCP port: https://github.com/MichaIng/DietPi/issues/4966
+	if [[ -f '/opt/dietpi-dashboard/config.toml' ]] && grep -Eq '^[[:blank:]]*port[[:blank:]]+=[[:blank:]]+8088$' /opt/dietpi-dashboard/config.toml
+	then
+		G_WHIP_BUTTON_CANCEL_TEXT='No' G_WHIP_YESNO '[ INFO ] Changed DietPi-Dashboard TCP port
+\nThe default TCP network port for the DietPi-Dashboard has been changed from 8088 to 5252 to resolve a port conflict with InfluxDB. However, if you do not use or plan to use InfluxDB, port 8088 does not cause any issues.
+\nDo you want to apply this change as well to your DietPi-Dashboard installation?' && G_CONFIG_INJECT 'port[[:blank:]]' 'port = 5252' /opt/dietpi-dashboard/config.toml
+	fi
+
+	# ownCloud/Nextcloud: Disable maintenance mode once manually, since DietPi-Services enabled of before this update but doesn't handle/disable it anymore afterwards.
+	[[ -f '/var/www/owncloud/config/config.php' ]] && grep -Eq "^[[:blank:]]*'maintenance'[[:blank:]]+=>[[:blank:]]+true,\$" /var/www/owncloud/config/config.php && G_EXEC sed -Ei "s/^[[:blank:]]*'maintenance'[[:blank:]]+=>[[:blank:]]+true,\$/  'maintenance' => false,/" /var/www/owncloud/config/config.php
+	[[ -f '/var/www/nextcloud/config/config.php' ]] && grep -Eq "^[[:blank:]]*'maintenance'[[:blank:]]+=>[[:blank:]]+true,\$" /var/www/nextcloud/config/config.php && G_EXEC sed -Ei "s/^[[:blank:]]*'maintenance'[[:blank:]]+=>[[:blank:]]+true,\$/  'maintenance' => false,/" /var/www/nextcloud/config/config.php
 }
 
 # v6.35 => v7 migration

.update/version

@@ -1,7 +1,7 @@
 # Available DietPi version
 G_REMOTE_VERSION_CORE=7
-G_REMOTE_VERSION_SUB=8
-G_REMOTE_VERSION_RC=2
+G_REMOTE_VERSION_SUB=9
+G_REMOTE_VERSION_RC=3
 # Minimum DietPi version to allow update
 G_MIN_VERSION_CORE=6
 G_MIN_VERSION_SUB=0
@@ -12,18 +12,6 @@ G_MIN_DEBIAN=4
 # Alternative Git branch to automatically migrate to when Debian version is too low
 G_OLD_DEBIAN_BRANCH='jessie-support'
 # Live patches
-G_LIVE_PATCH_DESC=(
-	[0]='Fix ReadyMedia, Deluge, Sonarr and Jellyfin installs'
-	[1]='Fix DietPi-Backup when using a location other than /mnt/dietpi-backup'
-	[2]='Fix Transmission install'
-)
-G_LIVE_PATCH_COND=(
-	[0]='! grep -q "G_EXEC systemctl stop minidlna" /boot/dietpi/dietpi-software'
-	[1]='grep -q "aRSYNC_LOGGING_OPTIONS" /boot/dietpi/dietpi-backup'
-	[2]='! grep -q "G_EXEC systemctl stop transmission-daemon" /boot/dietpi/dietpi-software'
-)
-G_LIVE_PATCH=(
-	[0]='sed -Ei "s/(G_AGI (minidlna|deluged|sonarr|jellyfin).*$)/\\1\\nG_EXEC systemctl stop \\2/" /boot/dietpi/dietpi-software'
-	[1]='curl -sSfL "https://raw.githubusercontent.com/MichaIng/DietPi/live-patch-1-v78/dietpi/dietpi-backup" -o /boot/dietpi/dietpi-backup'
-	[2]='sed -i "/G_AGI transmission-daemon/a\G_EXEC systemctl stop transmission-daemon" /boot/dietpi/dietpi-software'
-)
+G_LIVE_PATCH_DESC=()
+G_LIVE_PATCH_COND=()
+G_LIVE_PATCH=()