Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-09 18:01:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

amd64: always install grub-pc with shim-signed

Browse Source 
shim-signed depends on grub-efi-amd64-signed, which in turn has
alternative depends on either `grub-efi-amd64 | grub-pc`. However to
support booting with either via shim&signed-grub and BIOS, the choice
must be made to install grub-pc, not grub-efi-amd64.

This makes images consistent with Ubuntu Deskop, Live Server, buildd
bootable images; all of which already do install grub-pc and
shim-signed.

LP: #1901906
This commit is contained in:
Dimitri John Ledkov 2020-10-28 22:27:05 +00:00
parent 7033e0fae9
commit e2fd168f50
No known key found for this signature in database
GPG Key ID: 9B8EC849D5EF70ED
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
live-build/auto/config
View File

@ -778,8 +778,7 @@ case $PROJECT in
add_package install grub-pc add_package install grub-pc
;; ;;
amd64) amd64)
add_package install grub-pc-bin add_package install grub-pc
add_package install grub-efi-amd64-signed
add_package install shim-signed add_package install shim-signed
;; ;;
esac esac

2
live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
View File

@ -89,7 +89,7 @@ install_grub() {
efi_target=arm-efi efi_target=arm-efi
;; ;;
amd64) amd64)
chroot mountpoint apt-get install -qqy shim-signed chroot mountpoint apt-get install -qqy grub-pc shim-signed
efi_target=x86_64-efi efi_target=x86_64-efi
;; ;;
esac esac