Add defensive code around calls to db_get

Don't fail if they return errors.
This commit is contained in:
Steve McIntyre 2021-05-06 00:40:56 +01:00
parent fca6905653
commit 45dce64638
2 changed files with 9 additions and 2 deletions

7
debian/changelog vendored
View File

@ -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 shim (15.4-4) unstable; urgency=medium
* Fix up those maintainer scripts - if we're not running on an EFI * Fix up those maintainer scripts - if we're not running on an EFI

View File

@ -64,12 +64,12 @@ case $1 in
# call grub-install safely without dropping them # call grub-install safely without dropping them
OPTIONS="" OPTIONS=""
db_get grub2/force_efi_extra_removable db_get grub2/force_efi_extra_removable || RET=false
if [ "$RET" = true ]; then if [ "$RET" = true ]; then
OPTIONS="$OPTIONS --force-extra-removable" OPTIONS="$OPTIONS --force-extra-removable"
fi fi
db_get grub2/update_nvram db_get grub2/update_nvram || RET=true
if [ "$RET" = false ]; then if [ "$RET" = false ]; then
OPTIONS="$OPTIONS --no-nvram" OPTIONS="$OPTIONS --no-nvram"
fi fi