Merge ~andreserl/maas:lp1711203_secure_boot_workaround into maas:master

[Andres Rodriguez]

LP: #1711203 - Use grub instead of shim to workaround issues with Secure Boot deployment

[Lee Trager (ltrager)]

LGTM!

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b lp1711203_secure_boot_workaround lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

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

[MAAS Lander (maas-lander)]

LANDING
-b lp1711203_secure_boot_workaround lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

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

[MAAS Lander (maas-lander)]

LANDING
-b lp1711203_secure_boot_workaround lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

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

[Andres Rodriguez (andreserl)]

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b lp1711203_secure_boot_workaround lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

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

diff --git a/src/provisioningserver/boot/tests/test_uefi_amd64.py b/src/provisioningserver/boot/tests/test_uefi_amd64.py
index 5351b75..0a84266 100644
--- a/src/provisioningserver/boot/tests/test_uefi_amd64.py
+++ b/src/provisioningserver/boot/tests/test_uefi_amd64.py
@@ -132,7 +132,7 @@ class TestUEFIAMD64BootMethodRender(MAASTestCase):
                 purpose="local", arch="amd64"),
             }
         output = method.get_reader(**options).read(10000).decode("utf-8")
-        self.assertIn("chainloader /efi/ubuntu/shimx64.efi", output)
+        self.assertIn("chainloader /efi/ubuntu/grubx64.efi", output)
 
     def test_get_reader_with_enlist_purpose(self):
         # If purpose is "enlist", the config.enlist.template should be
diff --git a/src/provisioningserver/templates/uefi/config.local.amd64.template b/src/provisioningserver/templates/uefi/config.local.amd64.template
index 6233352..42e39eb 100644
--- a/src/provisioningserver/templates/uefi/config.local.amd64.template
+++ b/src/provisioningserver/templates/uefi/config.local.amd64.template
@@ -7,7 +7,7 @@ menuentry 'Local' {
     search --set=root --file /efi/Microsoft/Boot/bootmgfw.efi
     chainloader /efi/Microsoft/Boot/bootmgfw.efi
     {{else}}
-    search --set=root --file /efi/ubuntu/shimx64.efi
-    chainloader /efi/ubuntu/shimx64.efi
+    search --set=root --file /efi/ubuntu/grubx64.efi
+    chainloader /efi/ubuntu/grubx64.efi
     {{endif}}
 }