Enabled rpi-clone to handle the symlink removal from /boot/cmdline.txt to

/cmdline/firmware/cmdline.txt

Author: framps

rpi-clone

@@ -7,8 +7,10 @@
 # the rpi-clone github source repository:
 #    https://github.com/billw2/rpi-clone
 
+# This updated code is located in a fork of Bill Willsons git repository
+# at https://github.com/framps/rpi-clone
 
-version=2.0.22
+version=2.0.23
 
 # setup trusted paths for dependancies (like rsync, grub, fdisk, etc)
 export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
@@ -746,7 +748,6 @@ do
 	fi
 done
 
-
 # command line
 #
 setup_args=""
@@ -939,6 +940,8 @@ then
     exit 1
 fi
 
+cmdlinedir=$(awk '$1 !~ "^#" && $2 ~ "^/boot" && $3 == "vfat" { print substr($2, 2); exit }' /etc/fstab)
+
 if ((convert_to_partuuid))
 then
 	unattended=0
@@ -968,7 +971,7 @@ then
 		cp $fstab_tmp $fstab
 		printf "Your original fstab is backed up to $fstab_save\n"
 
-		cmdline_txt=$(realpath /boot/cmdline.txt)
+		cmdline_txt=/${cmdlinedir}/cmdline.txt
 		cmdline_save=$cmdline_txt.${PGM}-save
 		if [ -f $cmdline_txt ] && grep -q "$src_root_dev" $cmdline_txt
 		then
@@ -1727,15 +1730,15 @@ qecho ""
 # Fix PARTUUID or device name references in cmdline.txt and fstab
 #
 fstab=${clone}/etc/fstab
-cmdline_txt=${clone}$(realpath /boot/cmdline.txt)
+cmdline_txt=${clone}/${cmdlinedir}/cmdline.txt
 
 if [ -f $cmdline_txt ]
 then
 	if ((leave_sd_usb_boot && SD_slot_dst))
 	then
 		qecho "Leaving SD to USB boot alone."
-		cp $cmdline_txt ${clone}/boot/cmdline.boot
-		cmdline_txt=${clone}/boot/cmdline.boot
+		cp $cmdline_txt ${clone}/${cmdlinedir}/cmdline.boot
+		cmdline_txt=${clone}/${cmdlinedir}/cmdline.boot
 	fi
 	if grep -q $src_disk_ID $cmdline_txt
 	then
@@ -1749,8 +1752,8 @@ then
 	if ((leave_sd_usb_boot && SD_slot_boot))
 	then
 		qecho "Copying USB cmdline.txt to SD card to set up USB boot."
-		cp /boot/cmdline.txt /boot/cmdline.boot
-		cp $cmdline_txt /boot/cmdline.txt
+		cp /${cmdlinedir}/cmdline.txt /${cmdlinedir}/cmdline.boot
+		cp $cmdline_txt /${cmdlinedir}/cmdline.txt
 	fi
 fi
 
@@ -1764,7 +1767,6 @@ then
 	sed -i "s/${src_part_base}/${edit_fstab_name}/" "$fstab"
 fi
 
-
 rm -f $clone/etc/udev/rules.d/70-persistent-net.rules
 
 dst_root_vol_name=`e2label $dst_root_dev`