Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-04-18 14:41:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

amd64: revert all grub changes for xenial

Browse Source 
For LP: #1901906, on other releases we ensured that grub-pc is always
installed with shim-signed. However, xenial has different behavior that
does not work the same. This reverts those changes back to what
livecd-rootfs was before any of those changes were made, keeping only
the autoremove packages work.

LP: #1901906
This commit is contained in:
Joshua Powers 2020-12-04 13:26:52 -08:00
parent edc6ca4708
commit a9249b1773
No known key found for this signature in database
GPG Key ID: 83FC0713DA660C25
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
live-build/auto/config
View File

@ -501,9 +501,9 @@ case $PROJECT in
add_package install grub-pc
;;
amd64)
add_package install grub-pc
add_package install shim-signed
add_package install grub-pc-bin
add_package install grub-efi-amd64-signed
add_package install shim-signed
;;
armhf)
add_package install flash-kernel u-boot-tools

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

@ -86,7 +86,7 @@ install_grub() {
efi_target=arm64-efi
;;
amd64)
chroot mountpoint apt-get install -qqy grub-pc shim-signed grub-efi-amd64-signed
chroot mountpoint apt-get install -qqy grub-efi-amd64-signed grub-efi-amd64 shim-signed
grub_modules="multiboot serial usb usb_keyboard"
efi_target=x86_64-efi
;;