From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
Date: Mon, 7 Nov 2022 14:25:25 +0000 (+0100)
Subject: kernel-install/90-loaderentry: do not override an existing systemd.machine_id
X-Git-Tag: v253-rc1~582
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=802d9219aa19d759113dd6cd1e91b2bb661fe9ba;p=thirdparty%2Fsystemd.git

kernel-install/90-loaderentry: do not override an existing systemd.machine_id

If the systemd.machine_id command line option is already set, do not override
it.
---

diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install
index ea75e1b0d8d..41a05534b93 100755
--- a/src/kernel-install/90-loaderentry.install
+++ b/src/kernel-install/90-loaderentry.install
@@ -85,7 +85,7 @@ BOOT_OPTIONS="${BOOT_OPTIONS% }"
 # command line with the machine ID we use, so that the machine ID remains
 # stable, even during factory reset, in the initrd (where the system's machine
 # ID is not directly accessible yet), and if the root file system is volatile.
-if [ "$ENTRY_TOKEN" = "$MACHINE_ID" ] && ! echo "$BOOT_OPTIONS" | grep -q "systemd.machine_id=$MACHINE_ID"; then
+if [ "$ENTRY_TOKEN" = "$MACHINE_ID" ] && ! echo "$BOOT_OPTIONS" | grep -q "systemd.machine_id="; then
     BOOT_OPTIONS="$BOOT_OPTIONS systemd.machine_id=$MACHINE_ID"
 fi