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 6aa136298d576a79430dca2669c4d6b4b74719bf..cc711190fa59afae837ce45ca12dae6275041e46 100644 (file)
--- 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 7e9c7cc9aea1dc9025023fcf8bba478060f0a4c7..9db84afdbbb9da3ebfbd22dff6e94e611a66b9ab 100755 (executable)
--- 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)