curtin

Merge ~oddbloke/curtin/+git/curtin:lp1845914 into curtin:master

  1. Git
  2. lp:~oddbloke/curtin/+git/curtin
  3. lp1845914
  4. Merge into master
Proposed by Dan Watkins
Status: Merged
Approved by: Paride Legovini
Approved revision: 2d6054b4f079b85ea7e9dfe420e20da3c6eee884
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~oddbloke/curtin/+git/curtin:lp1845914
Merge into: curtin:master
Diff against target: 26 lines (+3/-1)
2 files modified
curtin/commands/curthooks.py (+2/-0)
tests/unittests/test_curthooks.py (+1/-1)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Paride Legovini Approve
Review via email: mp+373407@code.launchpad.net

Commit message

curthooks: use correct grub-efi package name on i386

i.e. grub-efi-ia32 instead of grub-efi-i386.

LP: #1845914

To post a comment you must log in.
Revision history for this message
Paride Legovini (paride) wrote :

Looks good!

review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:2d6054b4f079b85ea7e9dfe420e20da3c6eee884
https://jenkins.ubuntu.com/server/job/curtin-ci/3720/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/3720/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/3720/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/3720/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=torkoal/3720/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/3720//rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/curtin/commands/curthooks.py b/curtin/commands/curthooks.py
2index 2869c6c..d2c06c4 100644
3--- a/curtin/commands/curthooks.py
4+++ b/curtin/commands/curthooks.py
5@@ -890,6 +890,8 @@ def install_missing_packages(cfg, target, osfamily=DISTROS.debian):
6 uefi_pkgs.extend(['grub2-efi-x64-modules'])
7 elif osfamily == DISTROS.debian:
8 arch = util.get_architecture()
9+ if arch == 'i386':
10+ arch = 'ia32'
11 uefi_pkgs.append('grub-efi-%s' % arch)
12
13 # Architecture might support a signed UEFI loader
14diff --git a/tests/unittests/test_curthooks.py b/tests/unittests/test_curthooks.py
15index 614d37d..a1f41cb 100644
16--- a/tests/unittests/test_curthooks.py
17+++ b/tests/unittests/test_curthooks.py
18@@ -245,7 +245,7 @@ class TestInstallMissingPkgs(CiTestCase):
19 arch = 'i386'
20 self.mock_arch.return_value = arch
21 self.mock_machine.return_value = 'i386'
22- expected_pkgs = ['grub-efi-%s' % arch]
23+ expected_pkgs = ['grub-efi-ia32']
24 self.mock_machine.return_value = 'i686'
25 self.mock_uefi.return_value = True
26 target = "not-a-real-target"

Subscribers

People subscribed via source and target branches