mirror of
https://github.com/morgan9e/systemd
synced 2026-04-15 00:47:10 +09:00
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=.
This commit is contained in:
committed by
Luca Boccassi
parent
3be87dca03
commit
f106fd2dbd
@@ -9023,11 +9023,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,
|
||||
@@ -9037,6 +9032,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;
|
||||
|
||||
Reference in New Issue
Block a user