Merge ~ltrager/maas:chainload_shim into maas:master

[Lee Trager]

Chainload the local UEFI shim if available when local booting on AMD64.

This is pending the new shim in the MAAS stream from LP:1792575

[MAAS Lander (maas-lander)]

UNIT TESTS
-b chainload_shim lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/4121/console
COMMIT: 2f0dc959245cf4b7f67a1dc057946e30a8d38932

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b chainload_shim lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: db82decc4d3dfa2204648b2773d47bdf20e12e94

review: Approve

[Andres Rodriguez (andreserl)]

So, while this looks good, I'm concerned that your change of approach is too large or too risky for an rc release...

review: Needs Information

[MAAS Lander (maas-lander)]

UNIT TESTS
-b chainload_shim lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: b506c43234dfde569254d8035d198fb84f5c9648

review: Approve

[Lee Trager (ltrager)]

I've tested this in the CI and successfully deployed Ubuntu 18.04, CentOS 7, RHEL 7, and VMware ESXi 6.7. The loop is much cleaner to read and is supported by GRUB[1]. IMHO the risk is that we're changing from chainbooting local GRUB to chainbooting the local shim in an RC.

[1] https://www.gnu.org/software/grub/manual/grub/html_node/Shell_002dlike-scripting.html

[Andres Rodriguez (andreserl)]

ok. Please test Windows and report back in this branch.

On Thu, Oct 11, 2018 at 7:29 PM Lee Trager <email address hidden> wrote:

> I've tested this in the CI and successfully deployed Ubuntu 18.04, CentOS
> 7, RHEL 7, and VMware ESXi 6.7. The loop is much cleaner to read and is
> supported by GRUB[1]. IMHO the risk is that we're changing from
> chainbooting local GRUB to chainbooting the local shim in an RC.
>
> [1]
> https://www.gnu.org/software/grub/manual/grub/html_node/Shell_002dlike-scripting.html
> --
> https://code.launchpad.net/~ltrager/maas/+git/maas/+merge/356391
> You are reviewing the proposed merge of ~ltrager/maas:chainload_shim into
> maas:master.
>

--
Andres Rodriguez
Engineering Manager, MAAS
Canonical USA, Inc.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b chainload_shim lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: f42fe7a6141ab3d0167c1f8444347469d9382445

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b chainload_shim lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: ff0f0a4463803a2b313d18dd5738f06beebda591

review: Approve

[Lee Trager (ltrager)]

Verified this works with Windows as well

http://10.245.136.4:8080/job/maas-bionic-master-git-ea/55/console

[Andres Rodriguez (andreserl)]

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b chainload_shim lp:~ltrager/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/4255/consoleText

diff --git a/src/provisioningserver/boot/tests/test_uefi_amd64.py b/src/provisioningserver/boot/tests/test_uefi_amd64.py
index 0a84266..09fdc48 100644
--- a/src/provisioningserver/boot/tests/test_uefi_amd64.py
+++ b/src/provisioningserver/boot/tests/test_uefi_amd64.py
@@ -1,4 +1,4 @@
-# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2018 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for `provisioningserver.boot.uefi_amd64`."""
@@ -132,7 +132,10 @@ class TestUEFIAMD64BootMethodRender(MAASTestCase):
                 purpose="local", arch="amd64"),
             }
         output = method.get_reader(**options).read(10000).decode("utf-8")
-        self.assertIn("chainloader /efi/ubuntu/grubx64.efi", output)
+        self.assertIn("chainloader /efi/", output)
+        self.assertIn("bootx64.efi", output)
+        self.assertIn("shimx64.efi", output)
+        self.assertIn("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 62e2976..b8ffe40 100644
--- a/src/provisioningserver/templates/uefi/config.local.amd64.template
+++ b/src/provisioningserver/templates/uefi/config.local.amd64.template
@@ -3,43 +3,22 @@ set timeout=0
 
 menuentry 'Local' {
     echo 'Booting local disk...'
-    # Ubuntu and Ubuntu Core
-    search --set=root --file /efi/ubuntu/grubx64.efi
-    if [ $? -eq 0 ]; then
-        chainloader /efi/ubuntu/grubx64.efi
-        boot
-    fi
-    # CentOS 7
-    search --set=root --file /efi/centos/grubx64.efi
-    if [ $? -eq 0 ]; then
-        chainloader /efi/centos/grubx64.efi
-        boot
-    fi
-    # RHEL 7 unsigned bootloader, generated by Curtin
-    search --set=root --file /efi/rhel/grubx64.efi
-    if [ $? -eq 0 ]; then
-        chainloader /efi/rhel/grubx64.efi
-        boot
-    fi
-    # RHEL 7 signed bootloader, this may not work due to RHBZ #1623296
-    search --set=root --file /efi/redhat/grubx64.efi
-    if [ $? -eq 0 ]; then
-        chainloader /efi/redhat/grubx64.efi
-        boot
-    fi
-    # Windows
-    search --set=root --file /efi/Microsoft/Boot/bootmgfw.efi
-    if [ $? -eq 0 ]; then
-        chainloader /efi/Microsoft/Boot/bootmgfw.efi
-        boot
-    fi
-    # This is the default bootloader location according to the UEFI spec.
-    # This path is used by ESXi.
-    search --set=root --file /efi/boot/bootx64.efi
-    if [ $? -eq 0 ]; then
-        chainloader /efi/boot/bootx64.efi
-        boot
-    fi
+    for bootloader in \
+            boot/bootx64.efi \
+            ubuntu/shimx64.efi \
+            ubuntu/grubx64.efi \
+            centos/shimx64.efi \
+            centos/grubx64.efi \
+            rhel/shimx64.efi \
+            rhel/grubx64.efi \
+            red/grubx64.efi \
+            Microsoft/Boot/bootmgfw.efi; do
+        search --set=root --file /efi/$bootloader
+        if [ $? -eq 0 ]; then
+            chainloader /efi/$bootloader
+            boot
+        fi
+    done
     # If no bootloader is found exit and allow the next device to boot.
     exit
 }