Merge branch 'dev' of https://github.com/MichaIng/DietPi into dev

.meta/dietpi-survey_report

@@ -554,6 +554,8 @@ shopt -s extglob
 	do
 		# shellcheck disable=SC2034
 		aSOFTWARE_NAME7_6[$i]=${aSOFTWARE_NAME7_5[$i]}
+		# Pre-create software counter array so that we can see also software with 0 installs
+		aSOFTWARE["${aSOFTWARE_NAME7_6[$i]}"]=0
 	done
 
 	# $1 = File name

.update/patches

@@ -329,6 +329,32 @@ Patch_7_6()
 		G_EXEC systemctl daemon-reload
 		G_EXEC systemctl restart haveged
 	fi
+
+	# RPi Bullseye: Workaround for changed libraspberrypi0 file names
+	if (( $G_HW_MODEL < 10 ))
+	then
+		# Assure our newest Kodi package is installed, in case, to avoid conflicts with its pre/postinst scripts
+		if dpkg-query -s kodi 2> /dev/null | grep -q '^Version: .*-dietpi[12]$'
+		then
+			G_DIETPI-NOTIFY 2 'Upgrading the DietPi Kodi package'
+			G_EXEC cd /tmp
+			G_EXEC curl -sSfLO "https://dietpi.com/downloads/binaries/bullseye/kodi_$G_HW_ARCH_NAME.deb"
+			G_AGI "./kodi_$G_HW_ARCH_NAME.deb"
+			G_EXEC rm "kodi_$G_HW_ARCH_NAME.deb"
+		fi
+
+		# Loop through libraries and create symlink without zero ending, if not existing yet
+		while read -r lib
+		do
+			[[ -f $lib ]] || continue
+			local short=${lib%.0}
+			[[ -f $short ]] && continue
+			local new="/usr/local${short#/usr}"
+			[[ -f $new ]] && continue
+			G_EXEC ln -s "$lib" "$new"
+
+		done < <(dpkg -L 'libraspberrypi0' | grep '^/usr/lib/arm-linux-gnueabihf/lib.*\.so\.0$')
+	fi
 }
 
 # v6.35 => v7 migration

CHANGELOG.txt

@@ -6,6 +6,7 @@ Changes:
 - DietPi-FS_partition_resize | On first boot, DietPi automatically expands the root partition and filesystem to cover the full disk size. In some circumstances, e.g. on older kernel versions, it may happen that the two used commands "partprobe" and "partx -u" fail to inform the kernel about the changed partition table and hence the filesystem is not expanded. In such case, the system is now rebooted automatically once to assure that the new partition table is loaded and the filesystem is then expanded. This change affects only new images with contain DietPi v7.6 already, since this expansion is done before DietPi updates itself. Many thanks to @Dtrieb for reporting a case where the filesystem expansion failed: https://github.com/MichaIng/DietPi/issues/4582
 - DietPi-Drive_Manager | Native Linux exFAT support is now detected and respected by skipping the obsolete FUSE driver install in case. Additionally the new "exfatprogs" are installed on Bullseye, written and implemented with Debian Bullseye along with the native Linux exFAT implementation.
 - DietPi-Drive_Manager | exFAT mounts now have 775 mode and are owned by the "dietpi" group, if it was not manually removed. By default, when the FUSE driver is used, mounts have 777 mode so that all users have full access, which isn't optimal for security reasons. With native Linux exFAT support mounts have 755 mode by default, so that DietPi-Software's download and media software implementations don't have write access. "775 root:dietpi" is a good compromise if the "dietpi" group exists, matching the permissions for content directories in /mnt/dietpi_userdata. Many thanks to @K92Pi for reporting a related issue: https://github.com/MichaIng/DietPi/issues/4680
+- DietPi-Drive_Manager | Added support for moving the root filesystem to a different drive on Odroid N2.
 - DietPi-Software | TigerVNC: Instead of x11vnc, TigerVNC's own scraping server is now used for shared desktop mode, which is a bit lighter and shares a lot of libraries with the TigerVNC standaline server package.
 - DietPi-Software | RealVNC: Having desktop autologin enabled does not force the shared desktop VNC mode anymore. Furthermore our "vncserver.service" does not call RealVNC's "vncserver-x11-serviced.service" for the shared desktop mode, but instead the actual vncserver-x11 executable is called directly. This has some benefits, e.g. it allows to use our service for a virtual desktop while using RealVNC's service to allow connections to the shared local desktop independently. Many thanks to @K92Pi for bringing this idea to us: https://github.com/MichaIng/DietPi/issues/4672
 - DietPi-Software | RealVNC: The VNC server is now started with "VncAuth" authentication by default, which allows any VNC viewer to connect, not just RealVNC's ones. Use "vncpasswd" to change the password, which is now independent of the UNIX user passwords. It defaults to the global software password on a fresh install.
@@ -16,6 +17,7 @@ Changes:
 Fixes:
 - General | Resolved an issue on ARMv7 Buster and Bullseye system, where the haveged entropy daemon crashes due to limited syscall permissions. This can lead to several issues, like hanging boot, hanging installs or services starts. Many thanks to @jg777 for reporting this issue: https://github.com/MichaIng/DietPi/issues/4710
 - DietPi-Drive_Manager | Corrected false information when doing an exFAT filesystem check & repair: Until Stretch, only checking for exFAT errors is supported but not repairing them. From Buster on, both is fully supported.
+- DietPi-Drive_Manager | Resolved an issue where on Odroid C2 moving the root filesystem to a different drive failed. Many thanks to @yandritos for reporting this issue: https://github.com/MichaIng/DietPi/issues/4733
 - DietPi-LetsEncrypt | When enabling HTTPS redirect or HSTS and ownCloud or Nextcloud are installed, the "overwrite.cli.url" setting in the config.php is updated accordingly to contain the primary HTTPS domain. This is required for cron jobs and the occ/ncc commands to access ownCloud/Nextcloud through the webserver, as the Let's Encrypt certificate is only valid for the external domain name and not "localhost". Many thanks to @droogi for reporting a possibly related issue: https://github.com/MichaIng/DietPi/issues/4353
 - DietPi-Software | TigerVNC: Resolved an issue where remote connections didn't work by default on Bullseye systems, as a different configuration file is used.
 - DietPi-Software | LXDE: Resolved an issue on Raspberry Pi where calling lxappearance (Customize Look and Feel) failed due to incompatible RPi desktop packages. Many thanks to @pinipon for reporting this issue: https://github.com/MichaIng/DietPi/issues/4687

dietpi/dietpi-drive_manager

@@ -735,7 +735,7 @@ Do you wish to ignore this warning, and, mount the drive regardless?" || return
 		if (( $G_HW_MODEL < 10 )); then
 
 			# Find current root= and replace
-			local rootfs_current=$(mawk '{for(i=1;i<=NF;i++) {print $i} }' /boot/cmdline.txt | grep -m1 '^root=')
+			local rootfs_current=$(mawk '{for(i=1;i<=NF;i++) if($i~/^root=/) {print $i;exit}}' /boot/cmdline.txt)
 			G_EXEC sed -i "s#$rootfs_current#root=PARTUUID=${aDRIVE_PART_UUID[$MENU_DRIVE_INDEX]}#g" /boot/cmdline.txt
 
 			# Set FS type
@@ -745,11 +745,11 @@ Do you wish to ignore this warning, and, mount the drive regardless?" || return
 			# Add root delay
 			grep -qE '(^|[[:blank:]])rootdelay=' /boot/cmdline.txt || G_EXEC sed -i "s#rootfstype=${aDRIVE_FSTYPE[$MENU_DRIVE_INDEX]}#rootfstype=${aDRIVE_FSTYPE[$MENU_DRIVE_INDEX]} rootdelay=10#" /boot/cmdline.txt
 
-		# C2/XU4: /boot/boot.ini
-		elif [[ $G_HW_MODEL == 1[12] ]]; then
+		# C2/XU4/N2: /boot/boot.ini
+		elif [[ $G_HW_MODEL == 1[125] ]]; then
 
 			# Find current root= to replace
-			local rootfs_current=$(mawk '{for(i=1;i<=NF;i++) {print $i} }' /boot/boot.ini | grep -m1 '^root=' | sed 's/\"//')
+			local rootfs_current=$(mawk '-F[" ]' '{for(i=1;i<=NF;i++) if($i~/^root=/) {print $i;exit}}' /boot/boot.ini)
 			G_EXEC sed -i "s#$rootfs_current#root=UUID=${aDRIVE_UUID[$MENU_DRIVE_INDEX]}#g" /boot/boot.ini
 
 		fi
@@ -1140,8 +1140,8 @@ Do you wish to ignore this warning, and, mount the drive regardless?" || return
 
 				fi
 
-				# Transfer RootFS
-				if [[ ${aDRIVE_MOUNT_SOURCE[$MENU_DRIVE_INDEX]} != "$G_ROOTFS_DEV" ]] && (( $G_HW_MODEL < 13 )); then
+				# Transfer RootFS: Supported on RPi and Odroids C2/XU4/N2
+				if [[ ${aDRIVE_MOUNT_SOURCE[$MENU_DRIVE_INDEX]} != "$G_ROOTFS_DEV" && ( $G_HW_MODEL -le 9 || $G_HW_MODEL == 1[125] ) ]]; then
 
 					G_WHIP_MENU_ARRAY+=('Transfer RootFS' ': Transfer RootFS to this drive')