curtin-dev team mailing list archive

[Michael Hudson-Doyle <mwhudsonlp@xxxxxxxxxxx>]

Michael Hudson-Doyle has proposed merging ~mwhudson/curtin:lp-1927703 into curtin:master.

Commit message:
curthooks: always install shim-signed if available (when UEFI booted)

Rather than just on amd64. It's been available on arm64 since at least
20.04 (and is in bionic-updates).

Requested reviews:
  curtin developers (curtin-dev)

For more details, see:
https://code.launchpad.net/~mwhudson/curtin/+git/curtin/+merge/402473
-- 
Your team curtin developers is requested to review the proposed merge of ~mwhudson/curtin:lp-1927703 into curtin:master.

diff --git a/curtin/commands/curthooks.py b/curtin/commands/curthooks.py
index eaeb9c4..c24cacd 100644
--- a/curtin/commands/curthooks.py
+++ b/curtin/commands/curthooks.py
@@ -1293,8 +1293,9 @@ def install_missing_packages(cfg, target, osfamily=DISTROS.debian):
             if distro.has_pkg_available(uefi_pkg_signed):
                 uefi_pkgs.append(uefi_pkg_signed)
 
-            # AMD64 has shim-signed for SecureBoot support
-            if arch == "amd64":
+            # amd64 and arm64 (since bionic) has shim-signed for
+            # SecureBoot support
+            if distro.has_pkg_available("shim-signed"):
                 uefi_pkgs.append("shim-signed")
         else:
             raise ValueError('Unknown grub2 package list for distro: %s' %