SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

repart: use id128_get_machine()

Browse Source 
This also makes that the seed is actually randomized when the read
machine ID is NULL.
This commit is contained in:
Yu Watanabe
2023-04-05 00:52:56 +09:00
parent 1adbc2a428
commit 5ee37b703e
1 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/partition/repart.c
+7 -17
View File
@@ -4909,24 +4909,14 @@ static int context_read_seed(Context *context, const char *root) {
return 0;
if (!arg_randomize) {
_cleanup_close_ int fd = -EBADF;
fd = chase_and_open("/etc/machine-id", root, CHASE_PREFIX_ROOT, O_RDONLY|O_CLOEXEC, NULL);
if (fd == -ENOENT)
log_info("No machine ID set, using randomized partition UUIDs.");
else if (fd < 0)
return log_error_errno(fd, "Failed to determine machine ID of image: %m");
else {
r = id128_read_fd(fd, ID128_FORMAT_PLAIN, &context->seed);
if (r < 0) {
if (!ERRNO_IS_MACHINE_ID_UNSET(r))
return log_error_errno(r, "Failed to parse machine ID of image: %m");
log_info("No machine ID set, using randomized partition UUIDs.");
}
r = id128_get_machine(root, &context->seed);
if (r >= 0)
return 0;
}
if (!ERRNO_IS_MACHINE_ID_UNSET(r))
return log_error_errno(r, "Failed to parse machine ID of image: %m");
log_info("No machine ID set, using randomized partition UUIDs.");
}
r = sd_id128_randomize(&context->seed);