Merge ~juliank/grub/+git/ubuntu:fix-esp-debconf-migration into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

[Julian Andres Klode]

[Julian Andres Klode (juliank)]

Meh, no bad comments about the plan

review: Approve

diff --git a/debian/changelog b/debian/changelog
index b2aa937..e8970f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+grub2 (2.04-1ubuntu26) UNRELEASED; urgency=medium
+
+  * Move /boot/efi -> debconf migration into wrapper, so it runs everywhere
+    (LP: #1872077)
+  * Display disk name and size in the ESP selection dialog, instead of ???
+
+ -- Julian Andres Klode <[e-mail]>  Tue, 14 Apr 2020 11:57:34 +0200
+
 grub2 (2.04-1ubuntu25) focal; urgency=medium
 
   [ Jean-Baptiste Lallement ]
diff --git a/debian/grub-multi-install b/debian/grub-multi-install
index ed66c1e..2414369 100755
--- a/debian/grub-multi-install
+++ b/debian/grub-multi-install
@@ -239,17 +239,36 @@ usable_efi_system_partitions()
 ###############################################################################
 FALLBACK_MOUNTPOINT=/var/lib/grub/esp
 
+# Initial install/upgrade from /boot/efi?
+db_fget grub-efi/install_devices seen
+seen="$RET"
+
 # Get configured value
 question=grub-efi/install_devices
 priority=high
 db_get grub-efi/install_devices
 valid=1
-for device in $RET; do
-  if [ ! -e "${device%,}" ]; then
-    valid=0
-    break
+
+# We either migrate /boot/efi over, or we check if we have invalid devices
+if [ -z "$RET" ] && [ "$seen" != "true" ]; then
+  echo "Trying to migrate /boot/efi into esp config"
+  esp="$(get_mounted_device /boot/efi)"
+  if [ "$esp" ]; then
+    esp="$(device_to_id "$esp")"
   fi
-done
+  if [ "$esp" ]; then
+    db_set grub-efi/install_devices "$esp"
+    db_fset grub-efi/install_devices seen true
+    RET="$esp"
+  fi
+else
+  for device in $RET; do
+    if [ ! -e "${device%,}" ]; then
+      valid=0
+      break
+    fi
+  done
+fi
 
 # If /boot/efi points to a device that's not in the list, trigger the
 # install_devices_disks_changed prompt below, but add the device behind
@@ -292,6 +311,7 @@ while :; do
 
   for partition_pair in $partitions; do
     partition_id="${partition_pair#*:}"
+    device="${partition_id%%-part*}"
     ids="${ids:+$ids, }$partition_id"
     describe_efi_system_partition "$(readlink -f "$device")" "$(readlink -f "$partition_id")" "$partition_id" "$(get_mountpoint "${partition_pair%%:*}")"
     RET="$(printf %s "$RET" | sed 's/,/\\,/g')"
diff --git a/debian/postinst.in b/debian/postinst.in
index fbca021..4e1dafa 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -728,20 +728,6 @@ case "$1" in
           fi
         fi
 
-        # Backwards /boot/efi compatibility: Move /boot/efi into the debconf
-        # setting on upgrades and install.
-        db_get grub-efi/install_devices || true
-        if [ -z "$RET" ] && dpkg --compare-versions "$2" lt 2.04-1ubuntu24~; then
-          esp="$(get_mounted_device /boot/efi)"
-          if [ "$esp" ]; then
-            esp="$(device_to_id "$esp")"
-          fi
-          if [ "$esp" ]; then
-            db_set grub-efi/install_devices "$esp"
-            db_fset grub-efi/install_devices seen true
-          fi
-        fi
-
         case @PACKAGE@ in
           grub-efi-ia32)  target=i386-efi ;;
           grub-efi-amd64) target=x86_64-efi ;;