From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 19 May 2022 12:43:03 +0000 (+0200)
Subject: kernel-install: bail if machine id generation fails
X-Git-Tag: v251~3^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b21ba8ac6bf6a5856cf1a939d3609c4d680d1dcb;p=thirdparty%2Fsystemd.git

kernel-install: bail if machine id generation fails

The call is unlikely to fail, but systemd-id128 might not be installed.
We shouldn't continue with the empty string.
---

diff --git a/src/kernel-install/kernel-install.in b/src/kernel-install/kernel-install.in
index 0428c88fb3c..48072e346b1 100755
--- a/src/kernel-install/kernel-install.in
+++ b/src/kernel-install/kernel-install.in
@@ -114,7 +114,9 @@ fi
 # compatibility).
 [ -z "$MACHINE_ID" ] && [ -r /etc/machine-info ] && . /etc/machine-info && MACHINE_ID="$KERNEL_INSTALL_MACHINE_ID"
 [ -z "$MACHINE_ID" ] && [ -r /etc/machine-id ]   && read -r MACHINE_ID </etc/machine-id
-[ -z "$MACHINE_ID" ] && MACHINE_ID="$(systemd-id128 new)"
+if [ -z "$MACHINE_ID" ]; then
+    MACHINE_ID="$(systemd-id128 new)" || exit 1
+fi
 
 # Now that we determined the machine ID to use, let's determine the "token" for
 # the boot loader entry to generate. We use that for naming the directory below