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

Merge lp:~vorlon/livecd-rootfs/coinstallable-grubz

Browse Source
This commit is contained in:
Steve Langasek 2018-06-06 17:34:02 -07:00
commit fff89931db
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@ -2,6 +2,11 @@ livecd-rootfs (2.531) UNRELEASED; urgency=medium
* ubuntu-cpc: Use linux-kvm for all amd64 minimized builds (LP: #1775472). * ubuntu-cpc: Use linux-kvm for all amd64 minimized builds (LP: #1775472).
[ Steve Langasek ]
* live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary: don't manually
install grub-efi-amd64 since that forces off grub-pc, which is otherwise
now coinstallable.
-- Daniel Watkins <oddbloke@ubuntu.com> Wed, 06 Jun 2018 17:17:32 -0700 -- Daniel Watkins <oddbloke@ubuntu.com> Wed, 06 Jun 2018 17:17:32 -0700
livecd-rootfs (2.530) cosmic; urgency=medium livecd-rootfs (2.530) cosmic; urgency=medium

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

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