30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
From c440081c968c93d527d441f4d106e0acad9540eb Mon Sep 17 00:00:00 2001
|
|
From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
|
|
Date: Mon, 7 Nov 2022 15:25:25 +0100
|
|
Subject: [PATCH] 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.
|
|
|
|
(cherry picked from commit 802d9219aa19d759113dd6cd1e91b2bb661fe9ba)
|
|
|
|
Related #2138081
|
|
---
|
|
src/kernel-install/90-loaderentry.install | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install
|
|
index ea75e1b0d8..41a05534b9 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
|
|
|