From: Paymon MARANDI <paymon@utubeipod.xyz>
Date: Wed, 22 Nov 2023 16:44:25 +0000 (-0500)
Subject: ukify: be more explicit about where to find ukify
X-Git-Tag: v255-rc4~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b99e4922ea6ab665da0c2ace69cf1a35701c10cb;p=thirdparty%2Fsystemd.git

ukify: be more explicit about where to find ukify

when KERNEL_INSTALL_UKIFY is not supplied we set ukify to $PWD/ukify

that will fail (perhaps only for manual installations):
FileNotFoundError: [Errno 2] No such file or directory: '/usr/src/linux-6.7-rc1/ukify'

this will make sure we have a sane default for UKIFY

Signed-off-by: Paymon MARANDI <paymon@utubeipod.xyz>
---

diff --git a/src/kernel-install/60-ukify.install.in b/src/kernel-install/60-ukify.install.in
index 0c2e03777dc..be1e21b4e7d 100755
--- a/src/kernel-install/60-ukify.install.in
+++ b/src/kernel-install/60-ukify.install.in
@@ -23,6 +23,7 @@ import argparse
 import os
 import runpy
 import shlex
+from shutil import which
 from pathlib import Path
 from typing import Optional
 
@@ -34,7 +35,7 @@ except (KeyError, ValueError):
     VERBOSE = False
 
 # Override location of ukify and the boot stub for testing and debugging.
-UKIFY = os.getenv('KERNEL_INSTALL_UKIFY', 'ukify')
+UKIFY = os.getenv('KERNEL_INSTALL_UKIFY', which('ukify'))
 BOOT_STUB = os.getenv('KERNEL_INSTALL_BOOT_STUB')