Imported 2.605

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.605) eoan; urgency=medium
+
+  [ David Krauser ]
+  * KVM disk images should derive from the uefi image.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 26 Jul 2019 14:36:03 -0300
+
 livecd-rootfs (2.604) eoan; urgency=medium
 
   * Stop installing the udisks2 and pulseaudio extra snaps for the UC18 kassel

live-build/ubuntu-cpc/hooks.d/base/kvm-image.binary

@@ -28,7 +28,7 @@ esac
 
 mount_d=$(mktemp -d)
 
-create_derivative "disk" "kvm" #sets ${derivative_img}
+create_derivative uefi kvm #sets ${derivative_img}
 mount_disk_image ${derivative_img} ${mount_d}
 
 # unmount disk image and remove created folders on exit
@@ -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}"
-
 # Remove initramfs for kvm image
 env DEBIAN_FRONTEND=noninteractive chroot "${mount_d}" apt-get \
     purge -y initramfs-tools busybox-initramfs
@@ -70,4 +67,4 @@ create_manifest ${mount_d} livecd.ubuntu-cpc.disk-kvm.manifest
 umount_disk_image ${mount_d}
 rm -rf ${mount_d}
 
-convert_to_qcow2 ${derivative_img} livecd.ubuntu-cpc.disk-kvm.img 
+convert_to_qcow2 ${derivative_img} livecd.ubuntu-cpc.disk-kvm.img