Add remount of /boot and /

Author: framps

rpi-clone

@@ -10,13 +10,11 @@
 # This updated code is located in a fork of Bill Wilson's git repository
 # at https://github.com/geerlingguy/rpi-clone
 
-version=2.0.23-1
+version=2.0.25
 
+# prefix debug statements with line numbers when -x is used 
 declare -r PS4='|${LINENO}> \011${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
 
-echo "@@@ rpi5 branch version from framp @@@"
-echo
-
 # setup trusted paths for dependancies (like rsync, grub, fdisk, etc)
 export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
@@ -297,8 +295,11 @@ rsync_file_system()
 	src_dir="$1"
 	dst_dir="$2"
 
-	qprintf "  => lsblk $(lsblk)\n"
+	qprintf "  => rsync $1 $2 $3 ..."
 
+	# make sure the partition is mounted
+	# sometimes it happens on RPi5 /boot is no longer mounted and then
+	# the cloned boot partition will be empty
 	if ! findmnt "$src_dir" &>/dev/null; then
 		if ! mount "$src_dir"; then
 			echo "??? Remount failure of $1."
@@ -309,8 +310,6 @@ rsync_file_system()
 		fi
 	fi
 
-	qprintf "  => rsync $1 $2 $3 ..."
-
 	if [ "$3" == "with-root-excludes" ]
 	then
 		rsync $rsync_options --delete \