From 4a77d4ceb9f682af9178a1d2dfd6f6f67a0249e1 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Tue, 23 Apr 2024 00:06:11 +0800 Subject: [PATCH] kernel-install/60-ukify: also search in {/run,/usr/local/lib}/kernel/ After db26d8025e5bbc188f93b645124126bbc550caa5, kernel-install takes config files under /run/ and /usr/local/lib/ into account too. The same should apply to ukify. Note that ukify when invoked alone searches under /run/systemd/, /etc/systemd/, /usr/local/lib/systemd/, and /usr/lib/systemd/, respectively, which is against our usual order... --- src/kernel-install/60-ukify.install.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/kernel-install/60-ukify.install.in b/src/kernel-install/60-ukify.install.in index e08455b1560..54a5dafa72e 100755 --- a/src/kernel-install/60-ukify.install.in +++ b/src/kernel-install/60-ukify.install.in @@ -150,7 +150,11 @@ def input_file_location( def uki_conf_location() -> Optional[Path]: - return input_file_location('uki.conf') + return input_file_location('uki.conf', + '/etc/kernel', + '/run/kernel', + '/usr/local/lib/kernel', + '/usr/lib/kernel') def devicetree_config_location() -> Optional[Path]: -- 2.47.3