Move setting of new Disk ID to after dd.

Author: billw2

rpi-clone

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version=2.0.10
+version=2.0.11
 
 # auto run grub-install if grub detected
 grub_auto=1
@@ -1182,7 +1182,11 @@ Use -U for unattended even if initializing.
 	dd if=/dev/$src_disk of=/dev/$dst_disk bs=1M count=$count
 	echo ""
 	sync
-
+	sleep 1
+	new_id=$(od -A n -t x -N 4 /dev/urandom | tr -d " ")
+	qprintf "x\ni\n0x$new_id\nr\nw\nq\n" | fdisk /dev/$dst_disk > /dev/null
+	sync
+	sleep 1
 	sfd0=$(sfdisk -d /dev/$src_disk)
 	if ((force_2_parts && (n_src_parts > n_image_parts)))
 	then
@@ -1213,18 +1217,13 @@ Use -U for unattended even if initializing.
 			printf "\n====$PGM\n==orig:\n%s\n\n==edited:\n%s\n" \
 					"$sfd0" "$sfd1" >> /tmp/$PGM-fail
 			printf "\n    Resize failed.  See /tmp/$PGM-fail.\n\n"
-
-			# Don't let dst disk keep source disk ID.  Can lead to remounts.
-			new_id=$(od -A n -t x -N 4 /dev/urandom | tr -d " ")
-			qprintf "x\ni\n0x$new_id\nr\nw\nq\n" | fdisk /dev/$dst_disk > /dev/null
 			exit 1
 		fi
 	done
 	printf "\n    Resize success.\n\n"
+	sync
 	sleep 2
-
-	new_id=$(od -A n -t x -N 4 /dev/urandom | tr -d " ")
-	qprintf "x\ni\n0x$new_id\nr\nw\nq\n" | fdisk /dev/$dst_disk > /dev/null
+	partprobe "/dev/$dst_disk"
 
 	for ((p = n_image_parts + 1; p <= n_src_parts; p++))
 	do