Merge ~xnox/grub:focal-fix-postinst-empty-device into ~ubuntu-core-dev/grub/+git/ubuntu:focal

[Dimitri John Ledkov]

postinst.in, grub-multi-install: fix logic of skipping installing onto any device, if one chose to not install bootloader on any device. LP: #1896608

diff --git a/debian/changelog b/debian/changelog
index 181b526..25d552d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+grub2 (2.04-1ubuntu26.6) UNRELEASED; urgency=medium
+
+  * postinst.in, grub-multi-install: fix logic of skipping installing onto
+    any device, if one chose to not install bootloader on any device. LP:
+    #1896608
+
+ -- Dimitri John Ledkov <[e-mail]>  Mon, 28 Sep 2020 14:11:41 +0100
+
 grub2 (2.04-1ubuntu26.5) focal; urgency=medium
 
   * ubuntu-linuxefi-arm64.patch: Fix build on armhf (LP: #1862279)
diff --git a/debian/grub-multi-install b/debian/grub-multi-install
index 9bd4089..bedc700 100755
--- a/debian/grub-multi-install
+++ b/debian/grub-multi-install
@@ -402,7 +402,14 @@ while :; do
         db_fset grub-efi/install_devices_empty seen false
       fi
     else
-      exit 1 # noninteractive
+      # if question was seen we are done
+      # Otherwise, abort
+      db_fget grub-efi/install_devices_empty seen
+      if [ "$RET" = true ]; then
+        break
+      else
+        exit 1
+      fi
     fi
   else
     break
diff --git a/debian/postinst.in b/debian/postinst.in
index e6dfe36..cedc137 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -685,7 +685,14 @@ case "$1" in
                   db_fset grub-pc/install_devices_empty seen false
                 fi
               else
-                exit 1 # noninteractive
+                # if question was seen we are done
+                # Otherwise, abort
+                db_fget grub-pc/install_devices_empty seen
+                if [ "$RET" = true ]; then
+                  break
+                else
+                  exit 1
+                fi
               fi
             else
               break