|
 |
ac3a84 |
From d3b559f5e561750e6c50449b2ca84b40abeb492d Mon Sep 17 00:00:00 2001
|
|
|
ac3a84 |
From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
|
|
|
ac3a84 |
Date: Fri, 4 Nov 2022 09:57:24 +0100
|
|
|
ac3a84 |
Subject: [PATCH] kernel-install/90-loaderentry: do not add multiple
|
|
|
ac3a84 |
systemd.machine_id options
|
|
|
ac3a84 |
|
|
|
ac3a84 |
Do not unconditionally add a new systemd.machine_id command line option, first
|
|
|
ac3a84 |
check if it already exists with the expected value.
|
|
|
ac3a84 |
|
|
|
ac3a84 |
Fixes #25203
|
|
|
ac3a84 |
|
|
|
ac3a84 |
(cherry picked from commit 981502c5cc9ce32c3f77ff74aad87cd6f0da3b16)
|
|
|
ac3a84 |
|
|
|
ac3a84 |
Related #2138081
|
|
|
ac3a84 |
---
|
|
|
ac3a84 |
src/kernel-install/90-loaderentry.install | 2 +-
|
|
|
ac3a84 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
ac3a84 |
|
|
|
ac3a84 |
diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install
|
|
|
ac3a84 |
index 743af33aa9..ea75e1b0d8 100755
|
|
|
ac3a84 |
--- a/src/kernel-install/90-loaderentry.install
|
|
|
ac3a84 |
+++ b/src/kernel-install/90-loaderentry.install
|
|
|
ac3a84 |
@@ -85,7 +85,7 @@ BOOT_OPTIONS="${BOOT_OPTIONS% }"
|
|
|
ac3a84 |
# command line with the machine ID we use, so that the machine ID remains
|
|
|
ac3a84 |
# stable, even during factory reset, in the initrd (where the system's machine
|
|
|
ac3a84 |
# ID is not directly accessible yet), and if the root file system is volatile.
|
|
|
ac3a84 |
-if [ "$ENTRY_TOKEN" = "$MACHINE_ID" ]; then
|
|
|
ac3a84 |
+if [ "$ENTRY_TOKEN" = "$MACHINE_ID" ] && ! echo "$BOOT_OPTIONS" | grep -q "systemd.machine_id=$MACHINE_ID"; then
|
|
|
ac3a84 |
BOOT_OPTIONS="$BOOT_OPTIONS systemd.machine_id=$MACHINE_ID"
|
|
|
ac3a84 |
fi
|
|
|
ac3a84 |
|