Resolve the conflict.

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.478) UNRELEASED; urgency=medium
+
+  * Add the IMAGEFORMAT=none to support generating a single rootfs.
+
+ -- Gary Wang <gary.wang@canonical.com>  Mon, 16 Oct 2017 10:40:30 +0800
+
 livecd-rootfs (2.477) artful; urgency=medium
 
   * Fix server live image to pull subiquity from the stable channel, not

live-build/auto/config

@@ -183,6 +183,9 @@ case $IMAGEFORMAT in
 		exit 0
 		;;
 
+	none)
+        OPTS="${OPTS:+$OPTS }--system=normal --chroot-filesystem $IMAGEFORMAT"
+		;;
 	*)
 		case $PROJECT in
 			ubuntu-server|ubuntu-touch|ubuntu-touch-custom)
@@ -652,6 +655,9 @@ esac
 case $PROJECT:${SUBPROJECT:-} in
 	ubuntu-server:live)
 		;;
+	ubuntu-server:system-image)
+        OPTS="${OPTS:+$OPTS }--linux-packages=linux-image"
+        ;;
 	ubuntu-server:*|ubuntu-base:*|ubuntu-touch:*|ubuntu-touch-custom:*)
 		OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
 		KERNEL_FLAVOURS=none
@@ -779,7 +785,7 @@ EOF
 		;;
 esac
 
-if [ $PROJECT = ubuntu-server ] && [ ${SUBPROJECT:-} != live ]; then
+if [ $PROJECT = ubuntu-server ] && [ "${SUBPROJECT:-}" != live ] && [ "${SUBPROJECT:-}" != system-image ]; then
 	cat > config/hooks/100-remove-fstab.chroot <<EOF
 #! /bin/sh
 rm -f /etc/fstab

live-build/ubuntu-cpc/hooks/032-disk-image.binary

@@ -12,6 +12,11 @@ BOOTPART_END=
 BOOT_MOUNTPOINT=
 ROOTPART_START=1
 
+if [ "${IMAGEFORMAT:-}" = "none" ]; then
+    echo "Skipping disk image build as we only generate rootfs."
+    exit 0
+fi
+
 case $ARCH:$SUBARCH in
 	ppc64el:*|powerpc:*)
 		echo "POWER disk images are handled separately"

live-build/ubuntu-cpc/hooks/032-root-squashfs.binary

@@ -3,6 +3,11 @@
 #
 # Generate a squashfs root and manifest
 
+if [ "${IMAGEFORMAT:-}" = "none" ]; then
+	echo "Skipping squashfs build as we only generate rootfs."
+    exit 0
+fi
+
 case $IMAGE_TARGETS in
 	""|*squashfs*)
 		;;

live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary

@@ -1,5 +1,10 @@
 #!/bin/bash -eux
 
+if [ "${IMAGEFORMAT:-}" = "none" ]; then
+    echo "Skipping EFI image build as we only generate rootfs."
+    exit 0
+fi
+
 case $ARCH in
     amd64|arm64)
         ;;

live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary

@@ -1,4 +1,10 @@
 #!/bin/bash -eux
+
+if [ "${IMAGEFORMAT:-}" = "none" ]; then
+    echo "Skipping disk images build as we only generate rootfs."
+    exit 0
+fi
+
 case $ARCH in
     ppc64el|powerpc)
         ;;

live-build/ubuntu-cpc/hooks/040-qcow2-image.binary

@@ -1,5 +1,10 @@
 #!/bin/bash -ex
 
+if [ "${IMAGEFORMAT:-}" = "none" ]; then
+    echo "Skipping qcow2 image build as we only generate rootfs."
+    exit 0
+fi
+
 case $IMAGE_TARGETS in
 	""|*qcow2*)
 		;;

live-build/ubuntu-cpc/hooks/040-vmdk-image.binary

@@ -3,6 +3,11 @@
 #
 # Generate VMDK files
 
+if [ "${IMAGEFORMAT:-}" = "none" ]; then
+    echo "Skipping VMDK image build as we only generate rootfs."
+    exit 0
+fi
+
 case $ARCH in
          i386|amd64) ;;
                   *) echo "VMDK images are not supported for $ARCH yet.";

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

@@ -13,6 +13,12 @@
 # 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
 # well use them.
+
+if [ "${IMAGEFORMAT:-}" = "none" ]; then
+    echo "Skipping OVA image build since we only generate rootfs."
+    exit 0
+fi
+
 case $ARCH in
         amd64)
             ovf_id=94

live-build/ubuntu-cpc/hooks/042-vagrant.binary

@@ -15,6 +15,11 @@
 # some packages in it, convert it to a vmdk, and then assemble the vagrant
 # box.
 
+if [ "${IMAGEFORMAT:-}" = "none" ]; then
+    echo "Skipping Vagrant image build since we only generate rootfs."
+    exit 0
+fi
+
 case $IMAGE_TARGETS in
 	""|*vagrant*)
 		;;