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

[Dimitri John Ledkov]

Trying to fix non-interactive postinst of grub-pc upgrades.

[Dimitri John Ledkov (xnox)]

Need to prepare ppa with this change.

[Pat Viafore (patviafore)]

review: Approve

[Robert C Jennings (rcj)]

Dimitri, you've asked for my review and this addition looks reasonable, but I'm not familiar enough with the code to know if the next block dealing with install_devices_empty should still break during non-interactive or if it should be similarly changed.

review: Needs Information

[Robert C Jennings (rcj)]

From IRC (#ubuntu-server): install_devices_empty means "i chose _to_ have package installed, but not actually install grub anywhere" which is fine non-interactively. because i want to have grub-install available to "rescue" other drives for example.

That answers my question so I'm +1

review: Approve

[Dimitri John Ledkov (xnox)]

Wrong branch target.

Better target & better commit message at https://code.launchpad.net/~ubuntu-core-dev/grub/+git/ubuntu/+merge/388432

Unmerged commits

5b31b1c... by Dimitri John Ledkov on 2020-07-30

When upgrading non-interactively, and grub-pc installation fails on to the configured devices abort the package upgrade. This should prevent missmatch between the grub core installed on the boot device and the grub modules unpacked. Missmatch between core and modules may lead to unpredictable results and boot failures. LP: #1889556

diff --git a/debian/changelog b/debian/changelog
index 4d388c9..e5fca29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+grub2 (2.04-1ubuntu26.2) UNRELEASED; urgency=medium
+
+  * When upgrading non-interactively, and grub-pc installation fails on to
+    the configured devices abort the package upgrade. This should prevent
+    missmatch between the grub core installed on the boot device and the
+    grub modules unpacked. Missmatch between core and modules may lead to
+    unpredictable results and boot failures. LP: #1889556
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 30 Jul 2020 15:19:17 +0100
+
 grub2 (2.04-1ubuntu26.1) focal; urgency=medium
 
   [ Julian Andres Klode ]
diff --git a/debian/postinst.in b/debian/postinst.in
index 4e1dafa..d0e68ae 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -658,7 +658,7 @@ case "$1" in
                     continue
                   fi
                 else
-                  break # noninteractive
+                  exit 1 # noninteractive
                 fi
               fi
             fi