From c3c4dfdfb175d2e1acb4679ad6dbf0003bb8a2f0 Mon Sep 17 00:00:00 2001 From: Michael Ferrari Date: Thu, 3 Oct 2024 14:02:12 +0200 Subject: [PATCH] repart: open target devices before UUID creation This is to ensure that the UUIDs from the CopyBlocks= devices are copied to the corresponding new partition instead of creating a new UUID for it. With this verity partitions can be copied, keeping their UUIDs to ensure that they still match up with what is specified in roothash=. (cherry picked from commit f106fd2dbdbd9debfc2d2ed4d96ae3108a29c79b) --- src/partition/repart.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/partition/repart.c b/src/partition/repart.c index 67fcf14699..375f953dcc 100644 --- a/src/partition/repart.c +++ b/src/partition/repart.c @@ -8285,11 +8285,6 @@ static int run(int argc, char *argv[]) { return r; } - /* Make sure each partition has a unique UUID and unique label */ - r = context_acquire_partition_uuids_and_labels(context); - if (r < 0) - return r; - /* Open all files to copy blocks from now, since we want to take their size into consideration */ r = context_open_copy_block_paths( context, @@ -8299,6 +8294,11 @@ static int run(int argc, char *argv[]) { if (r < 0) return r; + /* Make sure each partition has a unique UUID and unique label */ + r = context_acquire_partition_uuids_and_labels(context); + if (r < 0) + return r; + r = context_fstab(context); if (r < 0) return r; -- 2.25.1