From f9b52a6be360180c62a1d27b70d97ec78646da8f Mon Sep 17 00:00:00 2001 From: flixman Date: Wed, 16 Sep 2026 21:29:00 +0200 Subject: [PATCH] Implement fallback for cmdline in ukify installation Added fallback for cmdline if not provided in config. (cherry picked from commit 1e098a4b34c68e9b1878efb9d7c1b56a2c220619) --- src/kernel-install/60-ukify.install.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/kernel-install/60-ukify.install.in b/src/kernel-install/60-ukify.install.in index 2e46c88ddf..1d64dd26a1 100755 --- a/src/kernel-install/60-ukify.install.in +++ b/src/kernel-install/60-ukify.install.in @@ -265,11 +265,13 @@ def call_ukify(opts) -> None: if devicetree := devicetree_file_location(opts): opts2.devicetree = devicetree - opts2.cmdline = kernel_cmdline(opts) if BOOT_STUB: opts2.stub = BOOT_STUB ukify.apply_config(opts2) + # if cmdline is not provided through config file, fall back to the current cmdline + if opts2.cmdline is None: + opts2.cmdline = kernel_cmdline(opts) ukify.finalize_options(opts2) ukify.check_inputs(opts2) ukify.make_uki(opts2)