mirror of
https://github.com/systemd/systemd
synced 2024-09-06 16:56:43 +00:00
boot: Only use io.systemd.boot.kernel-cmdline-extra for type 1 images
Otherwise the cmdline is duplicated for UKIs.
This commit is contained in:
parent
a17ae1f8d5
commit
d6e8137716
|
@ -2376,7 +2376,7 @@ static EFI_STATUS image_start(
|
||||||
* so). */
|
* so). */
|
||||||
_cleanup_free_ char16_t *options = xstrdup16(options_initrd ?: entry->options_implied ? NULL : entry->options);
|
_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");
|
const char *extra = smbios_find_oem_string("io.systemd.boot.kernel-cmdline-extra");
|
||||||
if (extra) {
|
if (extra) {
|
||||||
_cleanup_free_ char16_t *tmp = TAKE_PTR(options), *extra16 = xstr8_to_16(extra);
|
_cleanup_free_ char16_t *tmp = TAKE_PTR(options), *extra16 = xstr8_to_16(extra);
|
||||||
|
|
Loading…
Reference in a new issue