diff --git a/diskimage_builder/elements/grub2/install.d/02-grub-install-spec b/diskimage_builder/elements/grub2/install.d/02-grub-install-spec deleted file mode 100755 index 3e79361af..000000000 --- a/diskimage_builder/elements/grub2/install.d/02-grub-install-spec +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then - set -x -fi -set -eu -set -o pipefail - -# grub-efi-amd64-signed in ubuntu post will try to call grub-efi-amd64 to install grub into root -# device which definitely fail at this stage -# the workaround is to skip error and remove postinst script -if [[ "ubuntu" =~ "$DISTRO_NAME" ]]; then - if ! install-packages grub-efi-amd64-signed; then - rm -f /var/lib/dpkg/info/grub-efi-amd64-signed.postinst - rm -f /var/lib/dpkg/info/grub-efi-amd64.postinst - fi - dpkg --configure grub-efi-amd64 - dpkg --configure grub-efi-amd64-signed -fi diff --git a/diskimage_builder/elements/grub2/pkg-map b/diskimage_builder/elements/grub2/pkg-map index 2923c152c..7a462fdeb 100644 --- a/diskimage_builder/elements/grub2/pkg-map +++ b/diskimage_builder/elements/grub2/pkg-map @@ -1,11 +1,4 @@ { - "distro":{ - "ubuntu":{ - "signed_grub_efi": "", - "signed_shim_efi": "shim-signed", - "grub_bios": "grub-pc-bin" - } - }, "family":{ "debian":{ "signed_grub_efi": "grub-efi-amd64-signed",