[Merge] ~davidkrauser/livecd-rootfs/+git/livecd-rootfs:kvm-derives-uefi into livecd-rootfs:ubuntu/master

[Robert C Jennings]

Review: Approve



Diff comments:

> diff --git a/live-build/ubuntu-cpc/hooks.d/base/kvm-image.binary b/live-build/ubuntu-cpc/hooks.d/base/kvm-image.binary
> old mode 100644
> new mode 100755
> index 1598390..931010b
> --- a/live-build/ubuntu-cpc/hooks.d/base/kvm-image.binary
> +++ b/live-build/ubuntu-cpc/hooks.d/base/kvm-image.binary
> @@ -46,12 +46,9 @@ trap cleanup_kvm EXIT
>  
>  divert_grub "${mount_d}"
>  replace_kernel ${mount_d} "linux-kvm"
> +chroot "${mount_d}" update-grub
>  undivert_grub "${mount_d}"
>  
> -#setup grub correctly
> -env DEBIAN_FRONTEND=noninteractive chroot "${mount_d}" update-grub
> -replace_grub_root_with_label "${mount_d}"

Okay, this is using uuid since the initrdless-boot changes.

> -
>  # Remove initramfs for kvm image
>  env DEBIAN_FRONTEND=noninteractive chroot "${mount_d}" apt-get \
>      purge -y initramfs-tools busybox-initramfs


-- 
https://code.launchpad.net/~davidkrauser/livecd-rootfs/+git/livecd-rootfs/+merge/370446
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~davidkrauser/livecd-rootfs/+git/livecd-rootfs:kvm-derives-uefi into livecd-rootfs:ubuntu/master.