Skip to content

Commit 10084f7

Browse files
committed
Added --follow-symlink in every sed command
1 parent 671035d commit 10084f7

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

rpi-clone

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,7 @@ then
957957
if grep -q "^/dev/${src_partition[p]}" $fstab_tmp
958958
then
959959
partuuid=$(lsblk -n -o PARTUUID /dev/${src_partition[p]})
960-
sed -i "s/\/dev\/${src_partition[p]}/PARTUUID=$partuuid/" $fstab_tmp
960+
sed -i --follow-symlinks "s/\/dev\/${src_partition[p]}/PARTUUID=$partuuid/" $fstab_tmp
961961
printf " Editing $fstab, changing /dev/${src_partition[p]} to $partuuid\n"
962962
((++count))
963963
fi
@@ -1727,7 +1727,7 @@ qecho ""
17271727
# Fix PARTUUID or device name references in cmdline.txt and fstab
17281728
#
17291729
fstab=${clone}/etc/fstab
1730-
cmdline_txt=$(realpath ${clone}/boot/cmdline.txt)
1730+
cmdline_txt=${clone}/boot/cmdline.txt
17311731

17321732
if [ -f $cmdline_txt ]
17331733
then
@@ -1740,11 +1740,11 @@ then
17401740
if grep -q $src_disk_ID $cmdline_txt
17411741
then
17421742
qecho "Editing $cmdline_txt PARTUUID to use $dst_disk_ID"
1743-
sed -i "s/${src_disk_ID}/${dst_disk_ID}/" "$cmdline_txt"
1743+
sed -i --follow-symlinks "s/${src_disk_ID}/${dst_disk_ID}/" "$cmdline_txt"
17441744
elif [ "$edit_fstab_name" != "" ] && grep -q ${src_part_base} $cmdline_txt
17451745
then
17461746
qecho "Editing $cmdline_txt references from $src_part_base to $edit_fstab_name"
1747-
sed -i "s/${src_part_base}/$edit_fstab_name/" "$cmdline_txt"
1747+
sed -i --follow-symlinks "s/${src_part_base}/$edit_fstab_name/" "$cmdline_txt"
17481748
fi
17491749
if ((leave_sd_usb_boot && SD_slot_boot))
17501750
then
@@ -1757,11 +1757,11 @@ fi
17571757
if grep -q $src_disk_ID $fstab
17581758
then
17591759
qecho "Editing $fstab PARTUUID to use $dst_disk_ID"
1760-
sed -i "s/${src_disk_ID}/${dst_disk_ID}/g" "$fstab"
1760+
sed -i --follow-symlinks "s/${src_disk_ID}/${dst_disk_ID}/g" "$fstab"
17611761
elif [ "$edit_fstab_name" != "" ] && grep -q ${src_part_base} $fstab
17621762
then
17631763
qecho "Editing $fstab references from $src_part_base to $edit_fstab_name"
1764-
sed -i "s/${src_part_base}/${edit_fstab_name}/" "$fstab"
1764+
sed -i --follow-symlinks "s/${src_part_base}/${edit_fstab_name}/" "$fstab"
17651765
fi
17661766

17671767

0 commit comments

Comments
 (0)