Skip to content

Support gpt partition tables #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Support gpt partition tables #19

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d471be9
Let sfdisk generate new disk id when initializing
matthijskooijman Apr 4, 2024
e2b3f56
Introduce change_disk_id() function
matthijskooijman Apr 4, 2024
b43dd66
Use sfdisk for getting the disk id
matthijskooijman Apr 4, 2024
9bb92c2
Support GPT partition tables
matthijskooijman Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 31 additions & 19 deletions rpi-clone
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ confirm()
}

# sfdisk is in fdisk package
commands="rsync parted fdisk findmnt column fsck.vfat"
packages="rsync parted util-linux mount bsdmainutils dosfstools"
commands="rsync parted fdisk findmnt column fsck.vfat uuidgen"
packages="rsync parted util-linux mount bsdmainutils dosfstools uuid-runtime"
need_packages=""

idx=1
Expand Down Expand Up @@ -567,6 +567,23 @@ ext_label()
printf -v "${4}" "%s" "$label_arg"
}

change_disk_id()
{
case "$src_disk_table_type" in
msdos)
new_id=$(od -A n -t x -N 4 /dev/urandom | tr -d " ")
;;
gpt)
new_id=$(uuidgen)
;;
*)
qecho " Unsupported partition table, cannot change Disk ID."
return 1
;;
esac
sfdisk --disk-id "$1" "$new_id"
}

get_src_disk()
{
partition=${1#/dev/}
Expand Down Expand Up @@ -646,9 +663,9 @@ src_df_table=$(echo "$tmp" | sed "s/root/$dev/")
n_src_parts=$(echo "$src_partition_table" | tail -n 1 | cut -d ":" -f 1)
src_disk_size=$(echo "$src_partition_table" \
| grep "^/dev/$src_disk" | cut -d ":" -f 2 | tr -d 's')

line=$(fdisk -l /dev/$src_disk | grep "Disk identifier:")
src_disk_ID=${line#*x}
src_disk_table_type=$(echo "$src_partition_table" \
| grep "^/dev/$src_disk" | cut -d ":" -f 6 )
src_disk_ID=$(sfdisk --disk-id "/dev/$src_disk")

src_mount_table=$(findmnt -o source,target -n -l \
| grep -e "^/dev/$src_disk" -e "^$src_root_dev" | tr -s " ")
Expand Down Expand Up @@ -1426,6 +1443,11 @@ Use -U for unattended even if initializing.
part="${src_part_base}$n_image_parts"
sfd1=$(echo "$sfd0" | sed "\/dev\/$part/s/size=[^,]*,//")

# Strip gpt last-lba marker, if any, that will needlessly limit to the src disk size.
sfd1=$(echo "$sfd1" | grep -v '^last-lba: ')
# Strip label-id, to let sfdisk generate a new disk id
sfd1=$(echo "$sfd1" | grep -v '^label-id: ')

if ((ext_part_num > 0 && !force_2_parts))
then
part="${src_part_base}$ext_part_num"
Expand Down Expand Up @@ -1460,23 +1482,16 @@ Use -U for unattended even if initializing.
printf " Try running $PGM again.\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
change_disk_id "/dev/$dst_disk"
exit 1
fi
done
printf "\n Resize success.\n"
printf " Changing destination Disk ID ..."
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
sync
sleep 2
partprobe "/dev/$dst_disk"
sleep 2
echo ""

for ((p = n_image_parts + 1; p <= n_src_parts; p++))
do
Expand Down Expand Up @@ -1632,20 +1647,17 @@ else
start_sec=$(date '+%s')
fi

line=$(fdisk -l /dev/$dst_disk | grep "Disk identifier:")
dst_disk_ID=${line#*x}
dst_disk_ID=$(sfdisk --disk-id "/dev/$dst_disk")
if [ "$dst_disk_ID" == "$src_disk_ID" ]
then
qecho "Destination disk has same Disk ID as source, changing it."
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 | grep changed
change_disk_id "/dev/$dst_disk"
sync
sleep 2
partprobe "/dev/$dst_disk"
sleep 2

line=$(fdisk -l /dev/$dst_disk | grep "Disk identifier:")
dst_disk_ID=${line#*x}
dst_disk_ID=$(sfdisk --disk-id "/dev/$dst_disk")
if [ "$dst_disk_ID" == "$src_disk_ID" ]
then
qecho " Failed to set a new Disk ID."
Expand Down