summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve McIntyre <steve@einval.com>2021-05-06 00:40:56 +0100
committerSteve McIntyre <steve@einval.com>2021-05-06 00:40:56 +0100
commit45dce64638fc70dd447bb5bdfc31d3eb035aec1c (patch)
treead5dac0a6c03a74e7f52d4daff7fd4e215429699
parentfca690565375b167d947e53d15ffdcf93fbee181 (diff)
downloadefi-boot-shim-debian/15.4-5.tar.gz
efi-boot-shim-debian/15.4-5.zip
Add defensive code around calls to db_getdebian/15.4-5
Don't fail if they return errors.
-rw-r--r--debian/changelog7
-rwxr-xr-xdebian/signing-template/@final_pkg_name@.postinst.in4
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index aacd2b24..3e344ad7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+shim (15.4-5) unstable; urgency=medium
+
+ * Add defensive code around calls to db_get. Don't fail if they
+ return errors.
+
+ -- Steve McIntyre <93sam@debian.org> Thu, 06 May 2021 00:37:49 +0100
+
shim (15.4-4) unstable; urgency=medium
* Fix up those maintainer scripts - if we're not running on an EFI
diff --git a/debian/signing-template/@final_pkg_name@.postinst.in b/debian/signing-template/@final_pkg_name@.postinst.in
index 17f54c87..3e8e53f7 100755
--- a/debian/signing-template/@final_pkg_name@.postinst.in
+++ b/debian/signing-template/@final_pkg_name@.postinst.in
@@ -64,12 +64,12 @@ case $1 in
# call grub-install safely without dropping them
OPTIONS=""
- db_get grub2/force_efi_extra_removable
+ db_get grub2/force_efi_extra_removable || RET=false
if [ "$RET" = true ]; then
OPTIONS="$OPTIONS --force-extra-removable"
fi
- db_get grub2/update_nvram
+ db_get grub2/update_nvram || RET=true
if [ "$RET" = false ]; then
OPTIONS="$OPTIONS --no-nvram"
fi