From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 13 Mar 2024 16:59:51 +0000 (+0100)
Subject: boot: Only use io.systemd.boot.kernel-cmdline-extra for type 1 images
X-Git-Tag: v256-rc1~538^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6e81377164796314e07ce47abd6e74f24efbeec;p=thirdparty%2Fsystemd.git

boot: Only use io.systemd.boot.kernel-cmdline-extra for type 1 images

Otherwise the cmdline is duplicated for UKIs.
---

diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c
index d64e560a527..6c0f956c32f 100644
--- a/src/boot/efi/boot.c
+++ b/src/boot/efi/boot.c
@@ -2376,7 +2376,7 @@ static EFI_STATUS image_start(
          * so). */
         _cleanup_free_ char16_t *options = xstrdup16(options_initrd ?: entry->options_implied ? NULL : entry->options);
 
-        if (!is_confidential_vm()) {
+        if (entry->type == LOADER_LINUX && !is_confidential_vm()) {
                 const char *extra = smbios_find_oem_string("io.systemd.boot.kernel-cmdline-extra");
                 if (extra) {
                         _cleanup_free_ char16_t *tmp = TAKE_PTR(options), *extra16 = xstr8_to_16(extra);