From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 10 Dec 2023 13:23:37 +0000 (+0100)
Subject: Look for /usr/lib/kernel/uki.conf as well
X-Git-Tag: v20~85^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2434177afd21ab733dba5878bf4cbf37ca892da8;p=thirdparty%2Fmkosi.git

Look for /usr/lib/kernel/uki.conf as well
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index ea5a527d1..066df44c5 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1447,9 +1447,10 @@ def build_uki(
         for p in state.config.extra_search_paths:
             cmd += ["--tools", p]
 
-    uki_config = state.pkgmngr / "etc/kernel/uki.conf"
-    if uki_config.exists():
-        cmd += ["--config", uki_config]
+    for d in ("etc/kernel", "usr/lib/kernel"):
+        uki_config = state.pkgmngr / d / "uki.conf"
+        if uki_config.exists():
+            cmd += ["--config", uki_config]
 
     if state.config.secure_boot:
         assert state.config.secure_boot_key