From: Daan De Meyer Date: Tue, 28 Jan 2025 12:37:54 +0000 (+0100) Subject: Move want_uki() check out of build_uki_profiles() X-Git-Tag: v25.3~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c28ee2e17c9226de1ab3bc59384aadb98b40988a;p=thirdparty%2Fmkosi.git Move want_uki() check out of build_uki_profiles() Otherwise the function is skipped in make_uki() even though it should never be skipped in that case if there are UKI profiles defined. --- diff --git a/mkosi/__init__.py b/mkosi/__init__.py index 9e24c8ec8..b5fecb170 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -2059,7 +2059,7 @@ def systemd_addon_stub_binary(context: Context) -> Path: def build_uki_profiles(context: Context, cmdline: Sequence[str]) -> list[Path]: - if not want_uki(context) or not context.config.unified_kernel_image_profiles: + if not context.config.unified_kernel_image_profiles: return [] stub = systemd_addon_stub_binary(context) @@ -2131,7 +2131,7 @@ def install_kernel(context: Context, partitions: Sequence[Partition]) -> None: token = find_entry_token(context) cmdline = finalize_cmdline(context, partitions, finalize_roothash(partitions)) - profiles = build_uki_profiles(context, cmdline) + profiles = build_uki_profiles(context, cmdline) if want_uki(context) else [] for kver, kimg in gen_kernel_images(context): if want_uki(context):