From c5fbeedb0c9e154ddde7ad47b48b469dfc835d02 Mon Sep 17 00:00:00 2001 From: Harald Seiler Date: Thu, 15 Oct 2020 21:22:15 +0200 Subject: [PATCH] nspawn: robustly deal with "uninitialized" machine-id When nspawn starts an image, this image could be in any state, including an aborted first boot. For this case, it needs to correctly handle the situation like there was no machine-id at all. --- src/nspawn/nspawn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 82bb1673975..5db08cb5b3a 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -2726,7 +2726,7 @@ static int setup_machine_id(const char *directory) { etc_machine_id = prefix_roota(directory, "/etc/machine-id"); - r = id128_read(etc_machine_id, ID128_PLAIN, &id); + r = id128_read(etc_machine_id, ID128_PLAIN_OR_UNINIT, &id); if (r < 0) { if (!IN_SET(r, -ENOENT, -ENOMEDIUM)) /* If the file is missing or empty, we don't mind */ return log_error_errno(r, "Failed to read machine ID from container image: %m"); -- 2.47.3