From: Harald Seiler <hws@denx.de>
Date: Sun, 6 Sep 2020 19:23:36 +0000 (+0200)
Subject: dissect-image: support "uninitialized" machine-id
X-Git-Tag: v247-rc1~44^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ab763cb2be08410d45dafed9c2801406a427a4d3;p=thirdparty%2Fsystemd.git

dissect-image: support "uninitialized" machine-id

If the first boot was aborted, /etc/machine-id might read as
"uninitialized" in some cases.  Add a separate case for this
instead of printing a confusing error message.
---

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 91120d72194..cbd33572199 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -2148,6 +2148,8 @@ int dissected_image_acquire_metadata(DissectedImage *m) {
                                         log_debug_errno(r, "Image contains invalid /etc/machine-id: %s", line);
                         } else if (r == 0)
                                 log_debug("/etc/machine-id file is empty.");
+                        else if (streq(line, "uninitialized"))
+                                log_debug("/etc/machine-id file is uninitialized (likely aborted first boot).");
                         else
                                 log_debug("/etc/machine-id has unexpected length %i.", r);