Merge ~mwhudson/ubuntu/+source/grub-installer:lp-1847721 into ubuntu/+source/grub-installer:ubuntu/devel

[Michael Hudson-Doyle]

allow invoker to override architecture

[Michael Hudson-Doyle (mwhudson)]

This isn't sufficient, see comment on https://code.launchpad.net/~mwhudson/ubiquity/+git/ubiquity/+merge/384069. Not sure if the best approach is to continue this or to just do what needs to be done from ubiquity more directly.

7f7bd54... by Michael Hudson-Doyle on 2020-06-17

do not be fancy trying to determine which grub-efi package to install

4087f06... by Michael Hudson-Doyle on 2020-06-17

always pass --target x86_64-efi to grub-install on adm64/efi

[Michael Hudson-Doyle (mwhudson)]

So with these changes I can install a system booted in legacy mode and then boot it in UEFI mode.

[Michael Hudson-Doyle (mwhudson)]

Pushed some more changes to do with installing grub-pc under a UEFI booted system. Not tested.

[Michael Hudson-Doyle (mwhudson)]

I've taken the "install grub-pc under UEFI boot" out again.

Unmerged commits

4087f06... by Michael Hudson-Doyle on 2020-06-17

always pass --target x86_64-efi to grub-install on adm64/efi

7f7bd54... by Michael Hudson-Doyle on 2020-06-17

do not be fancy trying to determine which grub-efi package to install

813c82e... by Michael Hudson-Doyle on 2020-05-18

allow invoker to override architecture

de05494... by Jean-Baptiste Lallement on 2019-10-08

Import patches-unapplied version 1.128ubuntu14 to ubuntu/eoan-proposed

Imported using git-ubuntu import.

Changelog parent: 7ab883a303660bb8b02b99dfc4c2b5347bdc4cb6

New changelog entries:
  * When running on a ZFS filesystem udevadm returns an error
    which can be ignored. (LP: #1847228)
  * On zfs 0.8 cache is in /etc, do not attempt to copy it from
    /boot/zfs when it doesn't exist.

7ab883a... by Dimitri John Ledkov on 2019-09-25

Import patches-unapplied version 1.128ubuntu13 to ubuntu/eoan-proposed

Imported using git-ubuntu import.

Changelog parent: fa29c9a51de16c7debe93309a650f99f6212a5ce

New changelog entries:
  [ Cherrypick 1.165 Colin Watson ]
  * On Linux, mount/unmount /run to work around #918590. LP: #1838525

fa29c9a... by Mathieu Trudel-Lapierre on 2018-07-06

Import patches-unapplied version 1.128ubuntu12 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: a3f1e8cb03699a4dde45e453353721d4d5ed61a8

New changelog entries:
  [ Hans van den Bogert ]
  * Fix support for installation on NVMe with RAID1 (LP: #1771845)

a3f1e8c... by Łukasz Zemczak on 2018-06-27

Import patches-unapplied version 1.128ubuntu11 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: 1c3080d679c2c9d422a88e10ecd68a29f7b7357e

New changelog entries:
  * grub-installer: actually also do not purge grub-gfxpayload-lists as it's
    yet another dependency of grub-pc.

1c3080d... by Łukasz Zemczak on 2018-06-25

Import patches-unapplied version 1.128ubuntu10 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: b567a7569987f46f5f4fb533313c6c34fb0dfbe3

New changelog entries:
  * grub-installer: do not purge grub-pc-bin as well as it's a dependency of
    grub-pc.

b567a75... by Łukasz Zemczak on 2018-06-19

Import patches-unapplied version 1.128ubuntu9 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: 0b340924b407170e9c7e8785aaaa667f3549c908

New changelog entries:
  * grub-installer: install grub-pc for EFI setups and make sure we're
    not purging it earlier in case it got installed. It's needed to make sure
    the right maintainer scripts are run and the ESP populated. (LP: #1775743)

0b34092... by Mathieu Trudel-Lapierre on 2017-04-11

Import patches-unapplied version 1.128ubuntu8 to ubuntu/zesty-proposed

Imported using git-ubuntu import.

Changelog parent: af8e4efacd97c256890d7e7155eeed44fca5910b

New changelog entries:
  * Fix a typo in PReP bootdev selection code; we should not skip over a valid
    mpath device in favor of the underlying block device, since it won't be
    available for grub-install later. (LP: #1681932)

diff --git a/grub-installer b/grub-installer
index 8879dbe..2329f0e 100755
--- a/grub-installer
+++ b/grub-installer
@@ -8,11 +8,16 @@ set -e
 if [ "$1" ]; then
 	ROOT="$1"
 	chroot=chroot
+	shift
 else
 	ROOT=
 	chroot=
 fi
 
+if [ "$1" ]; then
+	ARCH="$1"
+fi
+
 . /usr/share/grub-installer/functions.sh
 . /usr/share/grub-installer/otheros.sh
 
@@ -37,7 +42,7 @@ debug () {
 	[ -z "${DEBCONF_DEBUG}" ] || log "debug: $@"
 }
 
-ARCH="$(archdetect)"
+ARCH="${ARCH:-$(archdetect)}"
 info "architecture: $ARCH"
 
 umount_dirs=
@@ -494,17 +499,7 @@ case $ARCH in
 	if [ -f /var/lib/partman/ignore_uefi ]; then
 		grub_package="grub-pc"
 	else
-		grub_package="grub-efi"
-		# Override the package choice if we can figure out the
-		# right package to use directly
-		if [ -f /sys/firmware/efi/fw_platform_size ] ; then
-			SIZE=$(cat /sys/firmware/efi/fw_platform_size)
-			if [ $SIZE -eq 64 ] ; then
-				grub_package="grub-efi-amd64-signed"
-			elif [ $SIZE -eq 32 ] ; then
-				grub_package="grub-efi-ia32"
-			fi
-		fi
+		grub_package="grub-efi-amd64-signed"
 		if [ ! -d /target/boot/efi ]; then
 			# No EFI System Partition, so presumably the partitioner
 			# believed this to be unnecessary, perhaps because we're
@@ -1094,6 +1089,10 @@ EOF
 			grub_install_params="$grub_install_params --force"
 		fi
 
+		if [ "$ARCH" = "amd64/efi" ] ; then
+		        grub_install_params="$grub_install_params --target x86_64-efi"
+                fi
+
 		CODE=0
 		case $ARCH:$grub_package in
 		    *:grub|*:grub-pc|*:grub-efi*|sparc:grub-ieee1275|ppc64el/*:grub-ieee1275)