[Merge] ~jchittum/livecd-rootfs:jammy-grub-dist-ubuntu into livecd-rootfs:ubuntu/jammy

[John Chittum]

Diff comments:

> diff --git a/live-build/buildd/hooks/02-disk-image-uefi.binary b/live-build/buildd/hooks/02-disk-image-uefi.binary
> index d358596..a8ee8e8 100755
> --- a/live-build/buildd/hooks/02-disk-image-uefi.binary
> +++ b/live-build/buildd/hooks/02-disk-image-uefi.binary
> @@ -97,7 +97,21 @@ install_grub() {
>      # not called here as it calls snap-seed-parse, resulting in duplicate
>      # snap listings)
>      chroot mountpoint dpkg-query -W > binary/boot/filesystem.packages
> -
> +    # LP: 2034253 
> +    # awaiting grub updates, we need to set the Distributor _before_ running grub-install
> +    # so that the EFI bits are in the correct place
> +    # buildd doesn't have `lsb_release`
> +    # so adding GRUB_DISTRIBUTOR, hardcoded to Ubuntu, for buildd for now
> +        cat > mountpoint/etc/default/grub.d/50-builddimg-settings.cfg << EOF
> +GRUB_DEFAULT=0
> +GRUB_HIDDEN_TIMEOUT=0.1
> +GRUB_HIDDEN_TIMEOUT_QUIET=true
> +GRUB_TIMEOUT=0.1
> +GRUB_CMDLINE_LINUX_DEFAULT="console=ttyS0"
> +GRUB_RECORDFAIL_TIMEOUT=0
> +GRUB_TERMINAL=console
> +GRUB_DISTRIBUTOR=Ubuntu
> +EOF

Yes, sorry! fixed, rebased, and squashed it up.

>      chroot mountpoint grub-install "${loop_device}" \
>          --boot-directory=/boot \
>          --efi-directory=/boot/efi \


-- 
https://code.launchpad.net/~jchittum/livecd-rootfs/+git/livecd-rootfs/+merge/450968
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/jammy.