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

Drop special handling of grub modules, adding a note. Modules should be included in the signed grub binaries when necessary.

Browse Source
This commit is contained in:
Mathieu Trudel-Lapierre 2017-08-23 20:23:32 -04:00
parent 869bb9808a
commit 563abee702
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,30 +62,21 @@ install_grub() {
efi_boot_dir="/boot/efi/EFI/BOOT" efi_boot_dir="/boot/efi/EFI/BOOT"
chroot mountpoint mkdir -p "${efi_boot_dir}" chroot mountpoint mkdir -p "${efi_boot_dir}"
# The modules below only make sense on non-Secure Boot UEFI systems. # UEFI GRUB modules are meant to be used equally by Secure Boot and
# Otherwise, with Secure Boot enabled GRUB will refuse to load them. # non-Secure Boot systems. If you need an extra module not already
# Any modules already in debian/build-efi-images do not need to be listed. # provided or run into "Secure Boot policy forbids loading X" problems,
# Furthermore, other modules such as terminal, video_* and efi_* are all # please file a bug against grub2 to include the affected module.
# already available.
case $ARCH in case $ARCH in
arm64) arm64)
chroot mountpoint apt-get -qqy install --no-install-recommends grub-efi-arm64 grub-efi-arm64-bin chroot mountpoint apt-get -qqy install --no-install-recommends grub-efi-arm64 grub-efi-arm64-bin
grub_modules="serial"
efi_target=arm64-efi efi_target=arm64-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 grub-efi-amd64 shim-signed
grub_modules="multiboot serial usb usb_keyboard"
efi_target=x86_64-efi efi_target=x86_64-efi
;; ;;
esac esac
cat << EOF >> mountpoint/etc/default/grub.d/50-cloudimg-settings.cfg
${IMAGE_STR}
# For Cloud Image compatability
GRUB_PRELOAD_MODULES="${GRUB_PRELOAD_MODULES:-$grub_modules}"
EOF
chroot mountpoint grub-install "${loop_device}" \ chroot mountpoint grub-install "${loop_device}" \
--boot-directory=/boot \ --boot-directory=/boot \
--efi-directory=/boot/efi \ --efi-directory=/boot/efi \