mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-01-11 05:17:44 +03:00
repart: correctly handle "uninitialized" machine-id
When systemd-repart runs from initramfs, it reads out /etc/machine-id from the rootfs as a seed for partition UUIDs. However, the machine-id could be in an "uninitialized" state from a previous failed first boot. In this situation the -ENOMEDIUM code-path (no machine-id set) should be taken.
This commit is contained in:
parent
c5fbeedb0c
commit
448b782cb2
@ -3245,7 +3245,7 @@ static int context_read_seed(Context *context, const char *root) {
|
||||
else if (fd < 0)
|
||||
return log_error_errno(fd, "Failed to determine machine ID of image: %m");
|
||||
else {
|
||||
r = id128_read_fd(fd, ID128_PLAIN, &context->seed);
|
||||
r = id128_read_fd(fd, ID128_PLAIN_OR_UNINIT, &context->seed);
|
||||
if (r == -ENOMEDIUM)
|
||||
log_info("No machine ID set, using randomized partition UUIDs.");
|
||||
else if (r < 0)
|
||||
|
Loading…
Reference in New Issue
Block a user