]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
boot: Only use io.systemd.boot.kernel-cmdline-extra for type 1 images
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 13 Mar 2024 16:59:51 +0000 (17:59 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 13 Mar 2024 22:42:34 +0000 (23:42 +0100)
Otherwise the cmdline is duplicated for UKIs.

src/boot/efi/boot.c

index d64e560a52788a9c8fb281491397ca3c29d7319d..6c0f956c32f17cc052f1216818770e21dc04ea4c 100644 (file)
@@ -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);