From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Date: Fri, 5 May 2023 10:22:57 +0000 (-0400)
Subject: ukify: typo in doc and print when package is missing
X-Git-Tag: v254-rc1~510^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e673c5c2d904d821719b2d21746ef91482acf8b4;p=thirdparty%2Fsystemd.git

ukify: typo in doc and print when package is missing

If a package is missing, a subprocess is started with None as
command argument. Error raised by subprocess is therefore not helpful
at all to understand what needs to be done to fix that error.

Also fix doc since systemd-stub will look for .cmdline files, and not
.cmdline.efi files.

Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---

diff --git a/man/ukify.xml b/man/ukify.xml
index 6aa136298d5..cc711190fa5 100644
--- a/man/ukify.xml
+++ b/man/ukify.xml
@@ -435,7 +435,7 @@ Phases=enter-initrd:leave-initrd
       --secureboot-private-key=sb.key \
       --secureboot-certificate=sb.cert \
       --cmdline='debug' \
-      --output=debug.cmdline.efi
+      --output=debug.cmdline
       </programlisting>
 
       <para>This creates a signed PE binary that contains the additional kernel command line parameter
diff --git a/src/ukify/ukify.py b/src/ukify/ukify.py
index 7e9c7cc9aea..9db84afdbbb 100755
--- a/src/ukify/ukify.py
+++ b/src/ukify/ukify.py
@@ -353,8 +353,10 @@ def find_tool(name, fallback=None, opts=None):
     if shutil.which(name) is not None:
         return name
 
-    return fallback
+    if fallback is None:
+        print(f"Tool {name} not installed!")
 
+    return fallback
 
 def combine_signatures(pcrsigs):
     combined = collections.defaultdict(list)