curtin-dev team mailing list archive

[Michael Hudson-Doyle <mp+450218@xxxxxxxxxxxxxxxxxx>]

Michael Hudson-Doyle has proposed merging ~mwhudson/curtin:install-grub-pc-if-needed into curtin:master.

Commit message:
ensure grub-pc is installed on non-UEFI amd64 installs

I was sure curtin did this already but LP: #2033496 says not.



Requested reviews:
  curtin developers (curtin-dev)
Related bugs:
  Bug #2033496 in ubuntu-desktop-installer: "[canary] fails to install on BIOS system: dpkg-query: package 'grub-pc' is not installed"
  https://bugs.launchpad.net/ubuntu-desktop-installer/+bug/2033496

For more details, see:
https://code.launchpad.net/~mwhudson/curtin/+git/curtin/+merge/450218
-- 
Your team curtin developers is requested to review the proposed merge of ~mwhudson/curtin:install-grub-pc-if-needed into curtin:master.

diff --git a/curtin/commands/curthooks.py b/curtin/commands/curthooks.py
index b0844d5..10a12bd 100644
--- a/curtin/commands/curthooks.py
+++ b/curtin/commands/curthooks.py
@@ -1288,12 +1288,13 @@ def install_missing_packages(cfg, target, osfamily=DISTROS.debian):
             if pkg not in needed_packages:
                 needed_packages.add(pkg)
 
+    arch = distro.get_architecture()
+
     # UEFI requires grub-efi-{arch}. If a signed version of that package
     # exists then it will be installed.
     if util.is_uefi_bootable():
         uefi_pkgs = ['efibootmgr']
         if osfamily == DISTROS.redhat:
-            arch = distro.get_architecture()
             if arch == 'amd64':
                 # centos/redhat doesn't support 32-bit?
                 if 'grub2-efi-x64-modules' not in installed_packages:
@@ -1310,7 +1311,6 @@ def install_missing_packages(cfg, target, osfamily=DISTROS.debian):
                     uefi_pkgs.extend(['grub2-efi-aa64-modules',
                                       'grub2-efi-aa64', 'shim-aa64'])
         elif osfamily == DISTROS.debian:
-            arch = distro.get_architecture()
             if arch == 'i386':
                 arch = 'ia32'
             uefi_pkgs.append('grub-efi-%s' % arch)
@@ -1326,7 +1326,6 @@ def install_missing_packages(cfg, target, osfamily=DISTROS.debian):
                 uefi_pkgs.append("shim-signed")
         elif osfamily == DISTROS.suse:
             uefi_pkgs.extend(['grub2', 'grub2-branding-SLE'])
-            arch = distro.get_architecture()
             if arch == 'amd64':
                 arch = 'x86_64'
             uefi_pkgs.append('grub2-%s-efi' % arch)
@@ -1335,6 +1334,10 @@ def install_missing_packages(cfg, target, osfamily=DISTROS.debian):
                              osfamily)
         needed_packages.update([pkg for pkg in uefi_pkgs
                                 if pkg not in installed_packages])
+    else:
+        if arch == 'amd64' and osfamily == DISTROS.debian:
+            if 'grub-pc' not in installed_packages:
+                needed_packages.add('grub-pc')
 
     # Filter out ifupdown network packages on netplan enabled systems.
     has_netplan = ('nplan' in installed_packages or