diff options
| author | Steve McIntyre <steve@einval.com> | 2021-07-12 09:51:50 +0100 |
|---|---|---|
| committer | Steve McIntyre <steve@einval.com> | 2021-07-12 10:16:24 +0100 |
| commit | 8fa494971dd53c0e68b0cfe7ee045dedf038702a (patch) | |
| tree | 0b51a2d9864cab3bd9d0f3e10311bd09ed8bf45d | |
| parent | d2ffa6309d7f810ec1e150ae0e124fc2c4b26f75 (diff) | |
| download | efi-boot-shim-debian/15.4-7_deb10u1.tar.gz efi-boot-shim-debian/15.4-7_deb10u1.zip | |
Tweak how we call grub-install; don't abort on errordebian/15.4-7_deb10u1
Not ideal behaviour either, but don't break upgrades. Copy the
behaviour from the grub packages here. Closes: #990966
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rwxr-xr-x | debian/signing-template/@final_pkg_name@.postinst.in | 10 |
2 files changed, 17 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 85af5c78..818bf222 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +shim (15.4-7~deb10u1) buster; urgency=high + + * 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. Bug #990966 + + -- Steve McIntyre <93sam@debian.org> Mon, 12 Jul 2021 08:59:53 +0100 + shim (15.4-6~deb10u1) buster; urgency=high * Add arm64 patch to tweak section layout and stop crashing diff --git a/debian/signing-template/@final_pkg_name@.postinst.in b/debian/signing-template/@final_pkg_name@.postinst.in index 3e8e53f7..3437badd 100755 --- a/debian/signing-template/@final_pkg_name@.postinst.in +++ b/debian/signing-template/@final_pkg_name@.postinst.in @@ -46,6 +46,14 @@ config_item () eval echo "\$$1" } +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 | \ @@ -74,7 +82,7 @@ case $1 in OPTIONS="$OPTIONS --no-nvram" fi - grub-install --target=${GRUB_EFI_TARGET} $OPTIONS + run_grub_install --target=${GRUB_EFI_TARGET} $OPTIONS fi ;; esac |