From: Marcus Schäfer <marcus.schaefer@gmail.com>
Date: Wed, 16 Nov 2022 15:25:08 +0000 (+0100)
Subject: Handle MACHINE_ID=uninitialized
X-Git-Tag: v253-rc1~508
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=305dd91adfde332e7e5c1b2470edb32774f9a032;p=thirdparty%2Fsystemd.git

Handle MACHINE_ID=uninitialized

systemd supports /etc/machine-id to be set to: uninitialized
In this case the expectation is that systemd creates a new
machine ID and replaces the value 'uninitialized' with the
effective machine id. In the scope of kernel-install we
should also enforce the creation of a new machine id in this
condition
---

diff --git a/src/kernel-install/kernel-install.in b/src/kernel-install/kernel-install.in
index bba22f8a206..fa2c0d5276a 100755
--- a/src/kernel-install/kernel-install.in
+++ b/src/kernel-install/kernel-install.in
@@ -160,6 +160,7 @@ if [ -z "$MACHINE_ID" ] && [ -f /etc/machine-info ]; then
 fi
 if [ -z "$MACHINE_ID" ] && [ -s /etc/machine-id ]; then
     read -r MACHINE_ID </etc/machine-id
+    [ "$MACHINE_ID" = "uninitialized" ] && unset MACHINE_ID
     [ -n "$MACHINE_ID" ] && \
         log_verbose "machine-id $MACHINE_ID acquired from /etc/machine-id"
 fi