Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 11:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'shim-signed-wants-pc' of https://git.launchpad.net/~xnox/livecd-rootfs into ubuntu/master

Browse Source
This commit is contained in:
Dimitri John Ledkov 2020-10-29 22:18:17 +00:00
commit 07d9e9ca9d
No known key found for this signature in database
GPG Key ID: 9B8EC849D5EF70ED
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.698) UNRELEASED; urgency=medium
* amd64: always install grub-pc with shim-signed (LP: #1901906)
-- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 28 Oct 2020 22:30:24 +0000
livecd-rootfs (2.697) hirsute; urgency=medium
[ John Chittum ]

3
live-build/auto/config
View File

@ -778,8 +778,7 @@ case $PROJECT in
add_package install grub-pc
;;
amd64)
add_package install grub-pc-bin
add_package install grub-efi-amd64-signed
add_package install grub-pc
add_package install shim-signed
;;
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
;;
amd64)
chroot mountpoint apt-get install -qqy shim-signed
chroot mountpoint apt-get install -qqy grub-pc shim-signed
efi_target=x86_64-efi
;;
esac