Generalize installation of GRUB for EFI.

Summary: See T97.

Test Plan: Already tested. Ship it!

Reviewers: tsimonq2

Reviewed By: tsimonq2

Differential Revision: https://phab.lubuntu.me/D33

debian/changelog

@@ -1,4 +1,4 @@
-calamares-settings-ubuntu (24) UNRELEASED; urgency=medium
+calamares-settings-ubuntu (24) cosmic; urgency=medium
 
   [ Wendy Hill ]
   * Rework the Lubuntu slideshow.
@@ -6,7 +6,10 @@ calamares-settings-ubuntu (24) UNRELEASED; urgency=medium
   [ Simon Quigley ]
   * Add -E to the desktop icon so that our nice theming carries over.
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 09 Oct 2018 13:32:45 -0500
+  [ Walter Lapchynski ]
+  * Generalize installation of GRUB for EFI.
+
+ -- Walter Lapchynski <wxl@ubuntu.com>  Tue, 09 Oct 2018 21:51:55 -0700
 
 calamares-settings-ubuntu (23) cosmic; urgency=medium
 

lubuntu/modules/before_bootloader_context.conf

@@ -2,16 +2,17 @@
 # Also pull in shim so secureboot has a chance at working.
 ---
 firmwareType:
-    efi:
+    bios:    /bin/false
-    - command: apt-cdrom add -m -d=/media/cdrom/
+    "*":
-      timeout: 10
+        -    command: apt-cdrom add -m -d=/media/cdrom/
-    - command: apt-get update
+             timeout: 10
-      timeout: 120
+        -    command: apt-get update
-    - command: apt install -y --no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict grub-efi-amd64-signed
+             timeout: 120
-      timeout: 300
+        -    command: apt install -y --no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict grub-efi-$(if [ "$(grep -q 64 /sys/firmware/efi/fw_platform_size)" ]; then echo amd64-signed; else echo ia32; fi)
-    - command: apt install -y --no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict shim-signed
+             timeout: 300
-      timeout: 300
+        -    command: apt install -y --no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict shim-signed
-    - command: sed -i '/deb cdrom/d' /etc/apt/sources.list
+             timeout: 300
-      timeout: 10
+        -    command: sed -i '/deb cdrom/d' /etc/apt/sources.list
-    - command: apt-get update
+             timeout: 10
-      timeout: 120
+        -    command: apt-get update
+             timeout: 120