Merge lp:~daniel-thewatkins/livecd-rootfs/minimized-skips-xenial

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.408.28) xenial; 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 <daniel.watkins@canonical.com>  Tue, 20 Mar 2018 12:42:25 -0400
+
 livecd-rootfs (2.408.27) xenial; urgency=medium
 
   * Don't ask for password and GECOS while creating vagrant user

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
+
 extension="disk1.vmdk"
 
 case $ARCH in

live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary

@@ -9,6 +9,14 @@
 #
 # 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

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
+
 cur_d=${PWD}
 my_d=$(dirname $(readlink -f ${0}))