In order to complete bionic verification, I worked around bug 2004437 by disabling Secure Boot. I then hit bug 1936857. I then worked around *that* by installing efibootmgr.
After getting everything upgraded, I rebooted on the new shim w/o an issue. I then rebooted again, re-enabled Secure Boot, and verified that mode worked fine as well.
In order to complete bionic verification, I worked around bug 2004437 by disabling Secure Boot. I then hit bug 1936857. I then worked around *that* by installing efibootmgr.
After getting everything upgraded, I rebooted on the new shim w/o an issue. I then rebooted again, re-enabled Secure Boot, and verified that mode worked fine as well.