Tweak how we call grub-install; don't abort on error

Not ideal behaviour either, but don't break upgrades. Copy the
behaviour from the grub packages here. Closes: #990984

3 files changed, 30 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index d78ac2a..87a6e37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+shim-signed (1.38) unstable; urgency=medium
+
+  * Tweak how we call grub-install; don't abort on error. Not ideal
+    behaviour either, but don't break upgrades. Copy the behaviour
+    from the grub packages here. Closes: #990984
+
+ -- Steve McIntyre <93sam@debian.org>  Mon, 12 Jul 2021 12:46:52 +0100
+
 shim-signed (1.37) unstable; urgency=medium
 
   * Build against new signed binaries corresponding to 15.4-6
diff --git a/debian/shim-signed.postinst b/debian/shim-signed.postinst
index f850043..1ddd00a 100755
--- a/debian/shim-signed.postinst
+++ b/debian/shim-signed.postinst
@@ -48,6 +48,15 @@ config_item ()
     eval echo "\$$1"
 }
 
+# Call grub-install but don't fail on errors. Let's not break upgrades
+run_grub_install()
+{
+    if ! grub-install $@ ; then
+        echo "Failed: grub-install $@" >&2
+        echo "WARNING: Bootloader is not properly installed, system may not be bootable" >&2
+    fi
+}
+
 case $1 in
     configure)
 	bootloader_id="$(config_item GRUB_DISTRIBUTOR | tr A-Z a-z | \
@@ -76,7 +85,8 @@ case $1 in
 		OPTIONS="$OPTIONS --no-nvram"
 	    fi
 
-	    grub-install --target=${GRUB_EFI_TARGET} $OPTIONS
+	    run_grub_install --target=${GRUB_EFI_TARGET} $OPTIONS
+
             if dpkg --compare-versions "$2" lt-nl "1.22~"; then
                 rm -f /boot/efi/EFI/ubuntu/MokManager.efi
             fi
diff --git a/debian/shim-signed.postrm b/debian/shim-signed.postrm
index a161df8..9db2640 100755
--- a/debian/shim-signed.postrm
+++ b/debian/shim-signed.postrm
@@ -51,6 +51,15 @@ config_item ()
     eval echo "\$$1"
 }
 
+# Call grub-install but don't fail on errors. Let's not break upgrades
+run_grub_install()
+{
+    if ! grub-install $@ ; then
+        echo "Failed: grub-install $@" >&2
+        echo "WARNING: Bootloader is not properly installed, system may not be bootable" >&2
+    fi
+}
+
 case $1 in
     remove|purge)
 	bootloader_id="$(config_item GRUB_DISTRIBUTOR | tr A-Z a-z | \
@@ -79,7 +88,8 @@ case $1 in
 		OPTIONS="$OPTIONS --no-nvram"
 	    fi
 
-	    grub-install --target=${GRUB_EFI_TARGET} $OPTIONS
+	    run_grub_install --target=${GRUB_EFI_TARGET} $OPTIONS
+
             if dpkg --compare-versions "$2" lt-nl "1.22~"; then
                 rm -f /boot/efi/EFI/ubuntu/MokManager.efi
             fi