diff --git a/debian/changelog b/debian/changelog index 5c8e621b..f0d0def6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.512) bionic; urgency=medium + + * ubuntu-cpc: When performing a minimized build, don't generate artifacts + that won't boot with the linux-kvm kernel (LP: #1757223). + + -- Daniel Watkins Tue, 20 Mar 2018 13:42:50 -0400 + livecd-rootfs (2.511) bionic; urgency=medium * Whitelist preserving "unowned" /var/log/journal. Maybe systemd package diff --git a/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary b/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary index 95b1d9a3..32740127 100755 --- a/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary +++ b/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary @@ -3,6 +3,15 @@ # # Generate VMDK files +case ${SUBPROJECT:-} in + minimized) + echo "Skipping minimized $0 build as images won't boot with linux-kvm" + exit 0 + ;; + *) + ;; +esac + case $ARCH in amd64) ;; *) echo "VMDK images are not supported for $ARCH yet."; diff --git a/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary b/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary index 48d77789..77a4b11a 100755 --- a/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary +++ b/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary @@ -9,6 +9,15 @@ # # For this step, we re-use the VMDK's made in 040-vmdk-image.binary +case ${SUBPROJECT:-} in + minimized) + echo "Skipping minimized $0 build as images won't boot with linux-kvm" + exit 0 + ;; + *) + ;; +esac + # Switch on $ARCH to determine which ID and description to use in the produced # OVF. We have fancy Ubuntu-specific IDs in the OVF specification, we might as diff --git a/live-build/ubuntu-cpc/hooks/042-vagrant.binary b/live-build/ubuntu-cpc/hooks/042-vagrant.binary index d92b7080..cb6c593c 100755 --- a/live-build/ubuntu-cpc/hooks/042-vagrant.binary +++ b/live-build/ubuntu-cpc/hooks/042-vagrant.binary @@ -15,6 +15,15 @@ # some packages in it, convert it to a vmdk, and then assemble the vagrant # box. +case ${SUBPROJECT:-} in + minimized) + echo "Skipping minimized $0 build as images won't boot with linux-kvm" + exit 0 + ;; + *) + ;; +esac + case $IMAGE_TARGETS in ""|*vagrant*) ;;