MAAS

Merge ~andreserl/maas:1.9 into maas:1.9

  1. Git
  2. lp:~andreserl/maas
  3. 1.9
  4. Merge into 1.9
Proposed by Andres Rodriguez
Status: Merged
Merged at revision: af0346a5aff4d610a042e1d0a93b8c99a55e7767
Proposed branch: ~andreserl/maas:1.9
Merge into: maas:1.9
Diff against target: 26 lines (+2/-2)
2 files modified
src/provisioningserver/boot/tests/test_uefi.py (+1/-1)
src/provisioningserver/boot/uefi.py (+1/-1)
Reviewer Review Type Date Requested Status
MAAS Lander Needs Fixing
Lee Trager (community) Approve
Newell Jensen (community) Approve
Review via email: mp+330038@code.launchpad.net

Commit message

LP: #1713795 - Grub changeg the shim's, breaking image import in Trusty.

To post a comment you must log in.
Revision history for this message
Newell Jensen (newell-jensen) wrote :

+1 LGTM

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b 1.9 lp:~andreserl/maas into -b 1.9 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/291/consoleText

Revision history for this message
Lee Trager (ltrager) wrote :

LGTM!

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b 1.9 lp:~andreserl/maas into -b 1.9 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/512/console
COMMIT: 1c31559bfd6374c057e542d4f7be42b7631c9841

review: Needs Fixing
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b 1.9 lp:~andreserl/maas into -b 1.9 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/512/console
COMMIT: 1c31559bfd6374c057e542d4f7be42b7631c9841

review: Needs Fixing
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b 1.9 lp:~andreserl/maas into -b 1.9 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/513/console
COMMIT: 1c31559bfd6374c057e542d4f7be42b7631c9841

review: Needs Fixing
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b 1.9 lp:~andreserl/maas into -b 1.9 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/842/consoleText

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/provisioningserver/boot/tests/test_uefi.py b/src/provisioningserver/boot/tests/test_uefi.py
2index ce1c099..26e1d7d 100644
3--- a/src/provisioningserver/boot/tests/test_uefi.py
4+++ b/src/provisioningserver/boot/tests/test_uefi.py
5@@ -308,7 +308,7 @@ class TestUEFIBootMethod(MAASTestCase):
6 self.assertEqual(grub_data, saved_grub_data)
7
8 shim_expected = os.path.join(
9- tmp, "usr", "lib", "shim", "shim.efi.signed")
10+ tmp, "usr", "lib", "shim", "shimx64.efi.signed")
11 shim_dest_expected = os.path.join(dest, method.bootloader_path)
12 grub_expected = os.path.join(
13 tmp, "usr", "lib", "grub", "x86_64-efi-signed",
14diff --git a/src/provisioningserver/boot/uefi.py b/src/provisioningserver/boot/uefi.py
15index e770b0e..544a37c 100644
16--- a/src/provisioningserver/boot/uefi.py
17+++ b/src/provisioningserver/boot/uefi.py
18@@ -143,7 +143,7 @@ class UEFIBootMethod(BootMethod):
19 # Extract the package with dpkg, and install the shim
20 call_and_check(["dpkg", "-x", shim_output, tmp])
21 install_bootloader(
22- os.path.join(tmp, 'usr', 'lib', 'shim', 'shim.efi.signed'),
23+ os.path.join(tmp, 'usr', 'lib', 'shim', 'shimx64.efi.signed'),
24 os.path.join(destination, self.bootloader_path))
25
26 # Download the grub-efi-amd64-signed package.

Subscribers

People subscribed via source and target branches