Merge lp:~tribaal/livecd-rootfs/xenial-proposed-build-info-minimal into lp:livecd-rootfs

[Chris Glass]

This change backports changes from bionic where the /etc/cloud/build.info file gets properly filled with a "minimal" build type instead of the generic "server" type when building cloud-images.

Unmerged revisions

1455. By Chris Glass on 2018-03-28

ubuntu-cpc: When performing a minimized build make sure the
/etc/cloud/build.info file says "minimal" (LP: #1759519)

1454. By Steve Langasek on 2018-03-20

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

1453. By Balint Reczey on 2017-12-21

 releasing package livecd-rootfs version 2.408.27

1452. By Balint Reczey on 2017-12-21

Merge lp:~rbalint/livecd-rootfs/vagrant-interactive-xenial

1451. By Łukasz Zemczak on 2017-12-18

releasing package livecd-rootfs version 2.408.26

1450. By Łukasz Zemczak on 2017-12-13

Changed default user configuration in the vagrant image, in accordance with the vagrant community's expectations

1449. By Balint Reczey on 2017-12-06

releasing package livecd-rootfs version 2.408.25

1448. By Balint Reczey on 2017-12-06

Merge lp:~rbalint/livecd-rootfs/deps-xenial

1447. By Łukasz Zemczak on 2017-11-21

releasing package livecd-rootfs version 2.408.24

1446. By Łukasz Zemczak on 2017-11-21

For the IMAGEFORMAT=none parts to work for ubuntu-image classic builds, we need to make sure IMAGEFORMAT is preserved and not overwritten if defined. Backporting from trunk.

=== modified file 'debian/changelog'
--- debian/changelog	2018-03-27 19:12:35 +0000
+++ debian/changelog	2018-03-28 13:08:01 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 livecd-rootfs (2.516) bionic; urgency=medium
 
   [ Chris Glass ]
@@ -1042,6 +1043,340 @@
 
  -- Łukasz 'sil2100' Zemczak <[e-mail]>  Wed, 04 May 2016 12:49:23 +0200
 
+=======
+livecd-rootfs (2.408.29) UNRELEASED; urgency=medium
+
+  * ubuntu-cpc: When performing a minimized build make sure the
+    /etc/cloud/build.info file says "minimal" (LP: #1759519)
+
+ -- Christopher Glass (Ubuntu) <[e-mail]>  Wed, 28 Mar 2018 12:08:48 +0200
+
+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 <[e-mail]>  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
+    (LP: #1569237)
+
+ -- Balint Reczey <[e-mail]>  Thu, 21 Dec 2017 09:20:32 +0100
+
+livecd-rootfs (2.408.26) xenial; urgency=medium
+
+  * Added a "vagrant" user to the vagrant image in addition to the "ubuntu"
+    user, in accordance with the vagrant community's expectations (LP: #1569237)
+
+ -- Christopher Glass (Ubuntu) <[e-mail]>  Thu, 07 Dec 2017 14:00:59 +0100
+
+livecd-rootfs (2.408.25) xenial; urgency=medium
+
+  * Sort and list dependencies nicely
+  * Depend on packages instead of installing them at run time
+  * Use xz -T4 instead of pxz.
+    Supported xz versions before 5.2 accept the -T4 option but ignore it.
+    Also depend on xz-utils instead of downloading pxz. (LP: #1701132)
+
+ -- Balint Reczey <[e-mail]>  Wed, 06 Dec 2017 11:34:04 +0100
+
+livecd-rootfs (2.408.24) xenial; urgency=medium
+
+  * For the IMAGEFORMAT=none parts to work for ubuntu-image classic builds, we
+    need to make sure IMAGEFORMAT is preserved and not overwritten if defined.
+    Backporting from artful.
+
+ -- Łukasz 'sil2100' Zemczak <[e-mail]>  Tue, 21 Nov 2017 17:01:14 +0100
+
+livecd-rootfs (2.408.23) xenial; urgency=medium
+
+  [ Gary Wang ]
+  * Add the IMAGEFORMAT=none to support generating a single rootfs
+    (LP: #1730642)
+
+  [ Christopher Glass (Ubuntu) ]
+  * Backport "minimized round 2" changes from trunk to Xenial (LP: #1731492)
+  * Remove apt, debconf, dpkg cruft files from /var/cache and /var/lib in
+    all our livefses.
+  * Pass --cache false to lb config; otherwise we copy around caches of
+    .debs that are never used properly, and which prevent us from emptying
+    /var/cache/apt in images.
+  * When building minimized cloud images, remove various packages that we
+    don't want installed by default.  Some are tools that aren't needed for
+    non-interactive use; some are libraries whose reverse-dependencies
+    will have already been removed; and one, open-vm-tools, should only be
+    included in images that are targeted to VMWare (which is not the case
+    for any of the current minimal images), rather than being included
+    directly in the cloud-image seed.
+
+ -- Steve Langasek <[e-mail]>  Tue, 14 Nov 2017 11:21:48 -0800
+
+livecd-rootfs (2.408.22) xenial; urgency=medium
+
+  * Make sure to remove any initramfs that was generated in a minimized
+    image.
+  * divert /usr/bin/systemd-detect-virt as part of the grub diversions, so
+    that the grub kernel postinst hook is operational when we're building
+    in a container.  LP: #1729034.
+
+ -- Steve Langasek <[e-mail]>  Sat, 21 Oct 2017 20:53:02 -0700
+
+livecd-rootfs (2.408.21) xenial; urgency=medium
+
+  [ Balint Reczey ]
+  * Use kvm kernel only on amd64.
+  * Make non-x86 minimized images consistent with x86 by not explicitly
+    installing the server task.
+  * Clean up dangling /boot/initrd.img symlink left behind on minimized
+    builds.
+
+ -- Steve Langasek <[e-mail]>  Fri, 20 Oct 2017 23:10:29 -0700
+
+livecd-rootfs (2.408.20) xenial; urgency=medium
+
+  * Now that grub-related diversions have been factored out in 2.466
+    instead of having bogus root=stuff arg generated in grub.cfg, it is
+    actually empty. Therefore update the sed command to make the arg in
+    the root= token optional. This should resolve non-booting livecd cpc
+    images.
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 10 Oct 2017 13:49:49 +0100
+
+livecd-rootfs (2.408.19) xenial; urgency=medium
+
+  [ Nishanth Aravamudan ]
+  * live-build/ubuntu-cpc/hooks/061-open-iscsi.chroot: generate iSCSI
+    Initiator Name at first iscsid run for cloud images to ensure it is
+    unique (LP: #1444992).
+
+  [ Steve Langasek ]
+  * Improve teardown_mountpoint to recursively find all submounts and
+    unmount them, instead of working from a hard-coded list.  This makes
+    the code resilient against other submounts being added later, including
+    downstream.  LP: #1721279.
+  * Also nuke the sleep / udevadm settle calls in the process, which should
+    never be required and slow down the builds.
+  * Fix a reference to an undefined variable in a script that's set -u.
+  * Use /bin/sh, not /bin/bash, for autopkgtest.
+  * debian/tests/default-bootstraps: minor adjustments to shell syntax,
+    syncing with artful where this originated.
+
+  [ Steve Langasek, Balint Reczey ]
+  * Introduce a new project-independent 'minimized' subproject
+    (LP: #1721261):
+    - omit ubuntu-minimal in favor of using only the minbase package set.
+    - boot directly by partuuid, avoiding the use of an initramfs.
+    - Bump needed live-build version which can build images without initrd
+    - drop man pages and most of the documentation from minimized images
+      (/usr/share/doc/*/copyright and changelog.Debian.gz files are still
+      kept)
+    - Add unminimize script for reverting minimization on a running system
+    - Mention unminimize script in motd
+    - Run autopkgtest for SUBPROJECT=minimized
+    - If we're using SUBPROJECT=minimized, and tzdata is not installed,
+      remove files that have been left behind.  This is a workaround for a
+      bug that should be fixed in tzdata.
+  * Factor out grub-related diversions and use them consistently, so we
+    don't end up with wrong os-probe output in our grub.cfg.
+
+  [ Balint Reczey ]
+  * Mount using --make-rslave to ensure safe unmounts for rbind mounts
+  * When SUBPROJECT environment variable is not set assume it to be ""
+
+ -- Steve Langasek <[e-mail]>  Wed, 04 Oct 2017 18:43:48 +0000
+
+livecd-rootfs (2.408.18) xenial; urgency=medium
+
+  [ Robert C Jennings ]
+  * Install udev before calls to udevadm
+
+ -- Steve Langasek <[e-mail]>  Wed, 13 Sep 2017 22:10:11 -0700
+
+livecd-rootfs (2.408.17) xenial; urgency=medium
+
+  [ Robert C Jennings ]
+  * live-build/ubuntu-cpc/functions: Add a function, teardown_mountpoint,
+    to reverse the work done in setup_mountpoint.  Lack of this function
+    has forced users of setup_mountpoint to implement this separately
+    and the implementations have diverged. (LP: #1716992)
+  * live-build/ubuntu-cpc/functions: Remove umount_settle function.
+    The was only used where teardown_mountpoint was lacking.
+
+ -- Steve Langasek <[e-mail]>  Wed, 13 Sep 2017 12:21:30 -0700
+
+livecd-rootfs (2.408.16) xenial; urgency=medium
+
+  * live-build/ubuntu-cpc/functions: call apt-get update in the chroot
+    after mounting a blank /var/lib/apt, so that further operations work
+    as expected; otherwise, 'apt-get purge ^grub-.*' fails on s390x because
+    no such packages are known to apt.
+  * live-build/ubuntu-cpc/hooks/030-root-tarball.binary: correct a missing
+    unmount of /var/{lib,cache}/apt on cleanup, detected via autopkgtests.
+
+ -- Steve Langasek <[e-mail]>  Tue, 12 Sep 2017 13:25:58 -0700
+
+livecd-rootfs (2.408.15) xenial; urgency=medium
+
+  [ Mathieu Trudel-Lapierre ]
+  * Drop preloading of grub modules that are built into the grub signed
+    image.  This is functionally a no-op, changed only to clean up the code.
+
+  [ Steve Langasek ]
+  * live-build/ubuntu-cpc/functions: mount tmpfs on /var/cache/apt and
+    /var/lib/apt, so we don't have to leave empty space in our derivative
+    images for packages that have been downloaded/installed/removed.  This
+    normally isn't relevant for the installed system, since the root
+    filesystem will auto-expand in place on the target disk, but lets us
+    ship smaller images.
+  * live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary: call apt-get
+    update *before* installing packages, not after.
+
+  [ Colin Watson ]
+  * Mount and unmount /dev recursively, to cope with setups where there are
+    interesting bind-mounts under /dev (e.g. loop devices bind-mounted by
+    LXD).  LP: #1716465.
+
+  [ Balint Reczey ]
+  * Fix suppression of kpartx error.  LP: #1684090.
+
+ -- Steve Langasek <[e-mail]>  Mon, 11 Sep 2017 14:38:42 -0700
+
+livecd-rootfs (2.408.14) xenial; urgency=medium
+
+  * live-build/auto/config: Filter libgles1-mesa out of tasks, as it is not a
+    dependency of anything in updates anymore, fixing mate/myth (LP: #1704013)
+
+ -- Adam Conrad <[e-mail]>  Wed, 12 Jul 2017 16:28:13 -0600
+
+livecd-rootfs (2.408.13) xenial; urgency=medium
+
+  [ Balint Reczey ]
+  * Source ubuntu-cpc functions from the right place
+  * Use all config hooks from the proper place, not from /build/
+  * Add basic but configurable autopkgtest (LP: #1690440)
+  * sync before calling kpartx to let writing to loop devices finish
+  * wrap kpartx and trap spurious errors, to work around kpartx
+    unreliability.
+
+ -- Steve Langasek <[e-mail]>  Tue, 06 Jun 2017 21:52:21 -0700
+
+livecd-rootfs (2.408.12) xenial; urgency=medium
+
+  * live-build/ubuntu-cpc/hooks/999-extras.binary: Exit on first failure.
+    (LP: #1687752)
+
+ -- Robert C Jennings <[e-mail]>  Tue, 09 May 2017 13:57:44 -0700
+
+livecd-rootfs (2.408.11) xenial; urgency=medium
+
+  * Add `apt-get update` to ubuntu-cpc ppc64el builds so they use the new
+    sources.
+
+ -- Daniel Watkins <[e-mail]>  Fri, 07 Apr 2017 16:12:53 -0400
+
+livecd-rootfs (2.408.10) xenial; urgency=medium
+
+  [ Adam Conrad ]
+  * Fix security mirror sources.list entries for non-x86 architectures.
+    (LP: #1679252)
+
+ -- Daniel Watkins <[e-mail]>  Mon, 03 Apr 2017 14:05:25 -0400
+
+livecd-rootfs (2.408.9) xenial; urgency=medium
+
+  [ Daniel Watkins ]
+  * Don't overwrite the default sources.list in cloud images.
+  * Replace sources.list generated using COMPONENTS with the sources.list from
+    an Ubuntu Server installation (i.e. with all components enabled, and all
+    deb-src lines commented).  LP: #1513529.
+
+  [ Chris Glass ]
+  * Fix the manifest generation in OVA files so that ovf files don't have
+    double extensions.  (LP: #1627931)
+  * Fix the OVF's metadata to include Ubuntu specific identifiers and
+    descriptions instead of the generic Linux ones.  (LP: #1656293) 
+
+  [ Daniel Watkins ]
+  * Add replace_grub_root_with_label function thereby consolidating multiple
+    uses of the same calls to sed.
+
+  [ Robert C Jennings ]
+  * ubuntu-cpc: Remove redundant copy of grub files. (LP: #1637290)
+
+ -- Robert C Jennings <[e-mail]>  Thu, 23 Mar 2017 14:40:59 -0400
+
+livecd-rootfs (2.408.8) xenial; urgency=medium
+
+  * Set device_tree_address for the new kernel in the RPi bootloader config.txt
+
+ -- Adam Conrad <[e-mail]>  Thu, 16 Feb 2017 10:21:51 -0700
+
+livecd-rootfs (2.408.7) xenial; urgency=medium
+
+  [ Łukasz 'sil2100' Zemczak ]
+  * Add additional hints to ubuntu-touch* i386/amd64 image builds to pull in
+    the gles version of the UITK.
+  * Now that we have have systemd working on ubuntu-touch, remove the
+    systemd-sysv- in add_package config to make sure we can build an image with
+    systemd as the init system.
+
+  [ Adam Conrad ]
+  * Forward-port hardware enablement delta from trusty to xenial, with changes:
+    - Implement hwe stack swapping as task filters instead of install hints
+    - Revert ubuntu-desktop and ubuntu-gnome to use tasks again for the above
+
+ -- Adam Conrad <[e-mail]>  Wed, 08 Feb 2017 11:50:52 -0700
+
+livecd-rootfs (2.408.5) xenial; urgency=medium
+ 
+  * Temporarily change the 60-install-click.chroot script to pull in clicks for
+    arm64 builds from a different location for ubuntu-touch.
+  * Add the new dhcpd user to touch hooks introduced by latest archive changes.
+  * Remove the ubuntu-pd project logic.
+  * Synced ubuntu-touch-custom changes from the vivid branch to xenial. This
+    also adds a new symlink called ubuntu-touch-custom to the ubuntu-touch hooks
+    dir.
+  * Stop using the overlay PPA for touch livecd-rootfs changes (LP: #1628085).
+
+ -- Łukasz 'sil2100' Zemczak <[e-mail]>  Tue, 27 Sep 2016 13:27:28 +0200
+
+livecd-rootfs (2.408.4) xenial; urgency=medium
+
+  * live-build/ubuntu-cpc/hooks/042-vagrant.binary: fix unmount handling
+    so that the teardown is done properly /before/ we try to make an
+    image from our filesystem, since otherwise /etc/resolv.conf is broken.
+    LP: #1621393.
+
+ -- Steve Langasek <[e-mail]>  Fri, 09 Sep 2016 17:04:54 -0700
+
+livecd-rootfs (2.408.3) xenial-proposed; urgency=medium
+
+  [ Louis Zuckerman ]
+  * Fixes for vagrant box builder in ubuntu-cpc LP: #1565985
+    - Install virtualbox-guest-utils
+    - Don't disable default synced folder
+    - Don't set vm name
+    - Add cloud-init config to manage /etc/hosts LP: #1561250
+
+ -- Brian Murray <[e-mail]>  Tue, 30 Aug 2016 13:17:55 -0700
+
+livecd-rootfs (2.408.2) xenial; urgency=medium
+
+  * Switch ubuntu-gnome from using tasks to metapackages (LP: #1602035)
+
+ -- Adam Conrad <[e-mail]>  Wed, 20 Jul 2016 01:46:41 -0600
+
+livecd-rootfs (2.408.1) xenial; urgency=medium
+
+  * Rename old ubuntu-core tarballs to ubuntu-base, for consistency with
+    the changes already made to yakkety and the ubuntu-cdimage project.
+    LP: #1579950.
+
+ -- Steve Langasek <[e-mail]>  Mon, 09 May 2016 17:00:19 -0700
+
+>>>>>>> MERGE-SOURCE
 livecd-rootfs (2.408) xenial; urgency=medium
 
   * drop linux-firmware-raspi2, it does not actually contain driver

=== modified file 'debian/control'
--- debian/control	2018-03-06 09:15:41 +0000
+++ debian/control	2018-03-28 13:08:01 +0000
@@ -4,10 +4,11 @@
 Build-Depends: debhelper (>= 7)
 Maintainer: Ubuntu Developers <[e-mail]>
 Standards-Version: 3.9.6
-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk
+Vcs-Bzr: lp:~ubuntu-core-dev/livecd-rootfs/xenial-proposed/
 
 Package: livecd-rootfs
 Architecture: any
+<<<<<<< TREE
 Depends: ${misc:Depends},
          apt-utils,
          debootstrap,
@@ -36,6 +37,34 @@
          vmdk-stream-converter [amd64 i386],
          xz-utils,
          zerofree
+=======
+Depends: ${misc:Depends},
+         android-tools-fsutils [armhf],
+         apt-utils,
+         debootstrap,
+         dosfstools,
+         e2fsprogs,
+         gdisk,
+         genisoimage,
+         germinate (>= 1.25.1),
+         gnupg,
+         grep-dctrl,
+         kpartx,
+         live-build (>= 3.0~a57-1ubuntu25.5~),
+         lsb-release,
+         lzma,
+         parted,
+         procps,
+         python-minimal | python,
+         python3-software-properties,
+         qemu-utils,
+         rsync,
+         squashfs-tools (>= 1:3.3-1),
+         vmdk-stream-converter [amd64 i386],
+         xz-utils,
+         zerofree
+Suggests: partimage
+>>>>>>> MERGE-SOURCE
 Breaks: ubuntu-defaults-builder (<< 0.32)
 Description: construction script for the livecd rootfs
  livecd-rootfs provides the script used to create the root filesystem

=== added directory 'debian/tests'
=== renamed directory 'debian/tests' => 'debian/tests.moved'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2018-03-28 13:08:01 +0000
@@ -0,0 +1,7 @@
+Tests: default-bootstraps
+Depends: @, lsb-release
+Restrictions: needs-root isolation-machine
+
+Tests: minimized
+Depends: @, lsb-release
+Restrictions: needs-root isolation-machine

=== added file 'debian/tests/default-bootstraps'
--- debian/tests/default-bootstraps	1970-01-01 00:00:00 +0000
+++ debian/tests/default-bootstraps	2018-03-28 13:08:01 +0000
@@ -0,0 +1,96 @@
+#!/bin/sh
+# autopkgtest check: Build default rootfs for all supported project:subproject pairs
+# (C) 2017 Canonical Ltd.
+# Author: Balint Reczey <[e-mail]>
+
+set -e
+
+if [ -z "$SUITE" ]; then
+    SUITE=$(lsb_release -c -s)
+fi
+
+# Known project:subproject:template combinations.
+# Listed subprojects can be combined with other projects as well,
+# but this list gives reasonable coverage.
+ALL_TRIPLETS="
+ base::
+ edubuntu::
+ edubuntu-dvd::
+ kubuntu::
+ kubuntu-active::
+ kubuntu-dvd::
+ kubuntu-plasma5::
+ lubuntu::
+ lubuntu-next::
+ mythbuntu::
+ ubuntu::
+ ubuntu-base::
+ ubuntu-budgie::
+ ubuntu-budgie-desktop::
+ ubuntu-budgie-live::
+ ubuntu-core:system-image:ubuntu-core
+ ubuntu-cpc::ubuntu-cpc
+ ubuntu-cpc:minimized:ubuntu-cpc
+ ubuntu-desktop-next:system-image:ubuntu-desktop-next
+ ubuntu-desktop-next::ubuntu-desktop-next
+ ubuntu-dvd::
+ ubuntu-gnome::
+ ubuntukylin::
+ ubuntu-mate::
+ ubuntu-mate-core::
+ ubuntu-mate-desktop::
+ ubuntu-mate-live::
+ ubuntu-netbook::
+ ubuntu-server::
+ ubuntu-server:ubuntu-rtm:
+ ubuntu-server:ubuntu-rtm/foo:
+ ubuntu-server:wubi:
+ ubuntu-touch-custom::ubuntu-touch-custom
+ ubuntu-touch::ubuntu-touch
+ xubuntu::"
+
+if [ -z "$SELECTED_TRIPLETS" ]; then
+    SELECTED_TRIPLETS="
+ ubuntu-base::
+ ubuntu-cpc::ubuntu-cpc
+"
+fi
+
+live_build_rootfs() {
+    PROJECT=${1%%:*}
+    local SUBPROJECT_TMP=${1%:*}
+    SUBPROJECT=${SUBPROJECT_TMP#*:}
+    TEMPLATE=${1##*:}
+    ARCH=$(dpkg --print-architecture)
+    echo "Building rootfs for project: '$PROJECT' subproject: '$SUBPROJECT' template: '$TEMPLATE' in $PWD"
+    cp -a /usr/share/livecd-rootfs/live-build/auto .
+    if [ -n "$TEMPLATE" ]; then
+        cp -a /usr/share/livecd-rootfs/live-build/$TEMPLATE .
+    fi
+    env PROJECT=$PROJECT \
+         SUBPROJECT=$SUBPROJECT \
+         SUITE=$SUITE \
+         ARCH=$ARCH \
+         lb config
+    mkdir chroot
+    # this part needs root rights, but right now the whole script ran as root by autopkgtest
+    env PROJECT=$PROJECT \
+         SUBPROJECT=$SUBPROJECT \
+         ARCH=$ARCH \
+         lb build
+    echo "Build results for project: '$PROJECT' subproject: '$SUBPROJECT' template: '$TEMPLATE' in $PWD"
+    du -sh *
+    echo ""
+}
+
+WORKDIR=$(mktemp -d)
+trap "RET=\$?; rm -rf $WORKDIR; exit \$RET" 0 INT QUIT ABRT PIPE TERM
+cd $WORKDIR
+
+for i in $SELECTED_TRIPLETS; do
+    mkdir $i
+    (cd $i && live_build_rootfs $i)
+    # clean up after build to avoid filling the disk, needs root rights
+    rm -rf $i
+done
+

=== added file 'debian/tests/minimized'
--- debian/tests/minimized	1970-01-01 00:00:00 +0000
+++ debian/tests/minimized	2018-03-28 13:08:01 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+env SELECTED_TRIPLETS=ubuntu-cpc:minimized:ubuntu-cpc debian/tests/default-bootstraps

=== modified file 'live-build/auto/build'
--- live-build/auto/build	2018-03-27 19:12:26 +0000
+++ live-build/auto/build	2018-03-28 13:08:01 +0000
@@ -94,6 +94,7 @@
 
 	lb bootstrap "$@"
 
+<<<<<<< TREE
 	case $PROJECT in
 		ubuntu-server|ubuntu-cpc)
 			# Set locale to C.UTF-8 by default. We should
@@ -209,6 +210,114 @@
 
 		chmod +x chroot/etc/update-motd.d/60-unminimize
         fi
+=======
+	if [ "${SUBPROJECT:-}" = minimized ] \
+	   && ! Chroot chroot dpkg -l tzdata 2>&1 |grep -q ^ii; then
+		# workaround for tzdata purge not removing these files
+		rm -f chroot/etc/localtime chroot/etc/timezone
+	fi
+
+	if [ "${SUBPROJECT:-}" = minimized ]; then
+		# set up dpkg filters to skip installing docs on minimized system
+		mkdir -p chroot/etc/dpkg/dpkg.cfg.d
+		cat > chroot/etc/dpkg/dpkg.cfg.d/excludes <<EOF
+# Drop all man pages
+path-exclude=/usr/share/man/*
+
+# Drop all documentation ...
+path-exclude=/usr/share/doc/*
+
+# ... except copyright files ...
+path-include=/usr/share/doc/*/copyright
+
+# ... and Debian changelogs
+path-include=/usr/share/doc/*/changelog.Debian.*
+EOF
+
+		# Remove docs installed by bootstrap
+		Chroot chroot dpkg-query -f '${binary:Package}\n' -W | Chroot chroot xargs apt-get install --reinstall
+
+                # Add unminimizer script which restores default image behavior
+                mkdir -p chroot/usr/local/sbin
+                cat > chroot/usr/local/sbin/unminimize <<'EOF'
+#!/bin/sh
+
+set -e
+
+echo "This system has been minimized by removing packages and content that are"
+echo "not required on a system that users do not log into."
+echo ""
+echo "This script restores the content and packages that are found on a default"
+echo "Ubuntu server system."
+echo ""
+echo "Reinstallation of packages may fail due to changes to the system"
+echo "configuration, the presence of third-party packages, or for other"
+echo "reasons."
+read -p "Would you like to continue? [y/N]" REPLY
+echo    # (optional) move to a new line
+if [ "$REPLY" != "y" ] && [ "$REPLY" != "Y" ]
+then
+    exit 1
+fi
+
+if [ -f /etc/dpkg/dpkg.cfg.d/excludes ] || [ -f /etc/dpkg/dpkg.cfg.d/excludes.dpkg-tmp ]; then
+    echo "Re-enabling installation of all documentation in dpkg..."
+    if [ -f /etc/dpkg/dpkg.cfg.d/excludes ]; then
+        mv /etc/dpkg/dpkg.cfg.d/excludes /etc/dpkg/dpkg.cfg.d/excludes.dpkg-tmp
+    fi
+    echo "Updating package list and upgrading packages..."
+    apt-get update
+    # apt-get upgrade asks for confirmation before upgrading packages to let the user stop here
+    apt-get upgrade
+    echo "Restoring system documentation..."
+    echo "Reinstalling packages with files in /usr/share/man/ ..."
+    # Reinstallation takes place in two steps because a single dpkg --verified
+    # command generates very long parameter list for "xargs dpkg -S" and may go
+    # over ARG_MAX. Since many packages have man pages the second download
+    # handles a much smaller amount of packages.
+    dpkg -S /usr/share/man/ |sed 's|, |\n|g;s|: [^:]*$||' | DEBIAN_FRONTEND=noninteractive xargs apt-get install --reinstall -y
+    echo "Reinstalling packages with system documentation in /usr/share/doc/ .."
+    # This step processes the packages which still have missing documentation
+    dpkg --verify --verify-format rpm | awk '/..5......   \/usr\/share\/doc/ {print $2}' | sed 's|/[^/]*$||' | sort |uniq \
+         | xargs dpkg -S | sed 's|, |\n|g;s|: [^:]*$||' | uniq | DEBIAN_FRONTEND=noninteractive xargs apt-get install --reinstall -y
+    if dpkg --verify --verify-format rpm | awk '/..5......   \/usr\/share\/doc/ {exit 1}'; then
+        echo "Documentation has been restored successfully."
+        rm /etc/dpkg/dpkg.cfg.d/excludes.dpkg-tmp
+    else
+        echo "There are still files missing from /usr/share/doc/:"
+        dpkg --verify --verify-format rpm | awk '/..5......   \/usr\/share\/doc/ {print " " $2}'
+        echo "You may want to try running this script again or you can remove"
+        echo "/etc/dpkg/dpkg.cfg.d/excludes.dpkg-tmp and restore the files manually."
+    fi
+fi
+
+if ! dpkg-query --show --showformat='${db:Status-Status}\n' ubuntu-minimal 2> /dev/null | grep -q '^installed$'; then
+    echo "Installing ubuntu-minimal package to provide the familiar Ubuntu minimal system..."
+    DEBIAN_FRONTEND=noninteractive apt-get install -y ubuntu-minimal
+fi
+
+# unminimization succeeded, there is no need to mention it in motd
+rm -f /etc/update-motd.d/60-unminimize
+
+EOF
+                chmod +x chroot/usr/local/sbin/unminimize
+
+		# inform users about the unminimize script
+		cat > "chroot/etc/update-motd.d/60-unminimize" << EOF
+#!/bin/sh
+#
+# This file is not managed by a package.  If you no longer want to
+# see this message you can safely remove the file.
+echo "This system has been minimized by removing packages and content that are"
+echo "not required on a system that users do not log into."
+echo ""
+echo "To restore this content, you can run the 'unminimize' command."
+EOF
+
+		chmod +x chroot/etc/update-motd.d/60-unminimize
+        fi
+
+>>>>>>> MERGE-SOURCE
 	Chroot chroot "dpkg-divert --quiet --add \
 		--divert /usr/sbin/update-initramfs.REAL --rename \
 		/usr/sbin/update-initramfs"
@@ -230,6 +339,7 @@
 
 	lb chroot "$@"
 
+<<<<<<< TREE
 	if [ "${SUBPROJECT:-}" = minimized ]; then
 		# force removal of initramfs-tools, which we assert is not
 		# required for any minimized images but is still pulled in by
@@ -255,6 +365,20 @@
 	rm -f chroot/var/cache/debconf/*-old chroot/var/lib/dpkg/*-old
 	Chroot chroot apt clean
 
+=======
+	if [ "${SUBPROJECT:-}" = minimized ]; then
+		# and if initramfs-tools was configured before our kernel,
+		# /etc/kernel/postinst.d/initramfs-tools will have created
+		# an initramfs despite the generic dpkg-divert; so remove it
+		# here.
+		rm -f chroot/boot/initrd.img-*
+	fi
+
+	# remove crufty files that shouldn't be left in an image
+	rm -f chroot/var/cache/debconf/*-old chroot/var/lib/dpkg/*-old
+	Chroot chroot apt clean
+
+>>>>>>> MERGE-SOURCE
 	if [ -f config/oem-config-preinstalled ]; then
 
 # This is cargo-culted almost verbatim (with some syntax changes for
@@ -381,6 +505,7 @@
 			> chroot/etc/apt/sources.list
 		rm chroot/etc/apt/sources.list.preinstall chroot/etc/apt/sources.list.orig
 	fi
+<<<<<<< TREE
 	case $PROJECT:$SUBPROJECT in
 		*)
 			if [ -e "config/seeded-snaps" ]; then
@@ -411,6 +536,9 @@
 	esac
 
 	if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then
+=======
+	if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then
+>>>>>>> MERGE-SOURCE
 		if [ "$ARCH" = "armhf" ]; then
 			INFO_DESC="$(lsb_release -d -s)"
 			echo "$INFO_DESC - $ARCH ($BUILDSTAMP)" >chroot/etc/media-info
@@ -428,6 +556,7 @@
 build_name: $BUILD_NAME
 serial: $BUILDSTAMP
 EOF
+<<<<<<< TREE
 	fi
 
 	# If the image pre-installs network-manager, let it manage all devices by
@@ -445,6 +574,8 @@
 EOF
 	else
 		echo "==== NetworkManager not installed ===="
+=======
+>>>>>>> MERGE-SOURCE
 	fi
 
 	echo "===== Checking size of /usr/share/doc ====="
@@ -805,6 +936,7 @@
 	if [ -z "$LB_LINUX_FLAVOURS" ] || [ "$LB_LINUX_FLAVOURS" = "none" ]; then
 		continue
 	fi
+	FLAVOUR=${FLAVOUR%%-hwe-*}
 	if [ "$FLAVOUR" = "virtual" ]; then
 		# The virtual kernel is named generic in /boot
 		FLAVOUR="generic"
@@ -838,17 +970,18 @@
 NUMFLAVOURS="$(set -- $LB_LINUX_FLAVOURS; echo $#)"
 if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then
 	# only one kernel flavour
+	FLAVOUR=${LB_LINUX_FLAVOURS%%-hwe-*}
 	if [ -e "binary/$INITFS/vmlinuz" ]; then
 		ln "binary/$INITFS/vmlinuz" "$PREFIX.kernel"
 		chmod 644 "$PREFIX.kernel"
 	else
-		ln -sf "$PREFIX.kernel-$LB_LINUX_FLAVOURS" "$PREFIX.kernel"
+		ln -sf "$PREFIX.kernel-$FLAVOUR" "$PREFIX.kernel"
 	fi
 	if [ -e "binary/$INITFS/initrd.lz" ]; then
 		ln "binary/$INITFS/initrd.lz" "$PREFIX.initrd"
 		chmod 644 "$PREFIX.initrd"
 	else
-		ln -sf "$PREFIX.initrd-$LB_LINUX_FLAVOURS" "$PREFIX.initrd"
+		ln -sf "$PREFIX.initrd-$FLAVOUR" "$PREFIX.initrd"
 	fi
 fi
 

=== modified file 'live-build/auto/config'
--- live-build/auto/config	2018-03-21 11:05:46 +0000
+++ live-build/auto/config	2018-03-28 13:08:01 +0000
@@ -59,9 +59,15 @@
 	# failure.
 
 	for task; do
+	    if [ -z "$HWE_BUILD" ]; then
 		# We need a ridiculous number of backslashes to protect
 		# parentheses from eval.
 		echo "!chroot chroot apt-cache dumpavail | grep-dctrl -nsPackage \\\\\\( -XFArchitecture $ARCH -o -XFArchitecture all \\\\\\) -a -wFTask $task" >> "config/package-lists/livecd-rootfs.list.chroot_$pass"
+	    else
+		# If HWE_BUILD is set, we strip out drivers not available
+		# in the HWE stack, then sed the rest with their HWE suffixes
+		echo "!chroot chroot apt-cache dumpavail | grep-dctrl -nsPackage \\\\\\( -XFArchitecture $ARCH -o -XFArchitecture all \\\\\\) -a -wFTask $task | grep -v xserver-xorg-input-vmmouse | grep -v libgles1-mesa | sed -e 's/xserver-xorg.*/&-hwe-16.04/'" >> "config/package-lists/livecd-rootfs.list.chroot_$pass"
+	    fi
 	done
 }
 
@@ -105,6 +111,7 @@
 	BINARY_HOOKS="${BINARY_HOOKS:+$BINARY_HOOKS }$1"
 }
 
+<<<<<<< TREE
 if [ -z "${IMAGEFORMAT:-}" ]; then
 	case $PROJECT:${SUBPROJECT:-} in
 		ubuntu-cpc:*)
@@ -121,6 +128,15 @@
 	mkdir -p .build
 	touch ".build/$STAGE"
 }
+=======
+if [ -z "${IMAGEFORMAT:-}" ]; then
+	case $PROJECT in
+		ubuntu-cpc)
+			IMAGEFORMAT=ext4
+			;;
+	esac
+fi
+>>>>>>> MERGE-SOURCE
 
 case $IMAGEFORMAT in
 	ext2|ext3|ext4)
@@ -144,6 +160,7 @@
 		;;
 
 	plain)
+<<<<<<< TREE
 		INITRAMFS_TYPE=none
 		case $PROJECT:${SUBPROJECT:-} in
 			ubuntu-server:live)
@@ -201,6 +218,15 @@
 	none)
 		OPTS="${OPTS:+$OPTS }--chroot-filesystem $IMAGEFORMAT"
 		;;
+=======
+		OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT"
+		PREINSTALLED=true
+		;;
+
+	none)
+		OPTS="${OPTS:+$OPTS }--chroot-filesystem $IMAGEFORMAT"
+		;;
+>>>>>>> MERGE-SOURCE
 	*)
 		case $PROJECT in
 			ubuntu-server|ubuntu-touch|ubuntu-touch-custom)
@@ -254,6 +280,7 @@
 		;;
 esac
 
+<<<<<<< TREE
 SIGNED_KERNEL_PACKAGE="linux-signed-generic"
 
 if [ "${SUBPROJECT:-}" = minimized ]; then
@@ -321,13 +348,30 @@
                 -S $SEEDMIRROR -m $MIRROR -d $SUITE -s $SEED \
                 ${COMPONENTS:+-c "$COMPONENTS"} -a $ARCH)
 fi
+=======
+HWE_X_PACKAGES="xserver-xorg-hwe-16.04 xserver-xorg-video-all-hwe-16.04 xserver-xorg-input-all-hwe-16.04"
+HWE_KERNEL_FLAVOUR="generic-hwe-16.04"
+HWE_SIGNED_KERNEL_PACKAGE="linux-signed-$HWE_KERNEL_FLAVOUR"
+
+if [ "${SUBPROJECT:-}" = minimized ]; then
+	OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal --linux-packages=linux-image"
+fi
+>>>>>>> MERGE-SOURCE
 
 case $PROJECT in
 	ubuntu|ubuntu-dvd)
-		add_task install minimal standard ubuntu-desktop
+<<<<<<< TREE
+		add_task install minimal standard ubuntu-desktop
+=======
+		HWE_BUILD="yes"
+		add_task install minimal standard ubuntu-desktop
+		add_package install $HWE_X_PACKAGES
+>>>>>>> MERGE-SOURCE
 		LIVE_TASK='ubuntu-live'
+		LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
+		KERNEL_FLAVOURS="$HWE_KERNEL_FLAVOUR"
 		case $ARCH in
-			amd64)	add_package live $SIGNED_KERNEL_PACKAGE ;;
+			amd64)	add_package live $HWE_SIGNED_KERNEL_PACKAGE ;;
 		esac
 		;;
 
@@ -351,11 +395,15 @@
 		;;
 
 	kubuntu|kubuntu-dvd)
+		HWE_BUILD="yes"
 		add_task install minimal standard
 		add_task install kubuntu-desktop
+		add_package install $HWE_X_PACKAGES
 		LIVE_TASK='kubuntu-live'
+		LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
+		KERNEL_FLAVOURS="$HWE_KERNEL_FLAVOUR"
 		case $ARCH in
-			amd64)	add_package live linux-signed-generic ;;
+			amd64)	add_package live $HWE_SIGNED_KERNEL_PACKAGE ;;
 		esac
 		COMPONENTS='main restricted universe'
 		add_chroot_hook remove-gnome-icon-cache
@@ -390,16 +438,17 @@
 		;;
 
 	xubuntu)
+		HWE_BUILD="yes"
 		add_task install minimal standard xubuntu-desktop
+		add_package install $HWE_X_PACKAGES
 		add_package install xterm
 		LIVE_TASK='xubuntu-live'
+		LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
+		KERNEL_FLAVOURS="$HWE_KERNEL_FLAVOUR"
 		case $ARCH in
-			amd64)	add_package live linux-signed-generic ;;
+			amd64)	add_package live $HWE_SIGNED_KERNEL_PACKAGE ;;
 		esac
 		COMPONENTS='main restricted universe multiverse'
-		case $ARCH in
-			amd64|i386)	KERNEL_FLAVOURS=generic ;;
-		esac
 		;;
 
 	ubuntu-netbook)
@@ -408,25 +457,32 @@
 		;;
 
 	mythbuntu)
+		HWE_BUILD="yes"
 		add_task install minimal standard mythbuntu-desktop
+		add_package install $HWE_X_PACKAGES
 		LIVE_TASK='mythbuntu-live'
+		LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
+		KERNEL_FLAVOURS="$HWE_KERNEL_FLAVOUR"
 		case $ARCH in
-			amd64)	add_package live linux-signed-generic ;;
+			amd64)	add_package live $HWE_SIGNED_KERNEL_PACKAGE ;;
 		esac
 		COMPONENTS='main restricted universe multiverse'
 		;;
 
 	lubuntu)
+		HWE_BUILD="yes"
 		add_task install minimal standard lubuntu-desktop
+		case $ARCH in
+			amd64|i386)	add_package install thermald ;;
+		esac
+		add_package install $HWE_X_PACKAGES
 		LIVE_TASK='lubuntu-live'
+		LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
+		KERNEL_FLAVOURS="$HWE_KERNEL_FLAVOUR"
 		case $ARCH in
-			amd64)	add_package live linux-signed-generic ;;
+			amd64)	add_package live $HWE_SIGNED_KERNEL_PACKAGE ;;
 		esac
 		COMPONENTS='main restricted universe multiverse'
-		case $ARCH in
-			amd64|i386)	KERNEL_FLAVOURS=generic ;;
-		esac
-
 		# The Lubuntu STRUCTURE file has "feature
 		# no-follow-recommends".  Mirror this.
 		APT_OPTIONS="${APT_OPTIONS} --no-install-recommends"
@@ -449,10 +505,14 @@
 		;;
 
 	ubuntu-gnome)
+		HWE_BUILD="yes"
 		add_task install minimal standard ubuntu-gnome-desktop
+		add_package install $HWE_X_PACKAGES
 		LIVE_TASK='ubuntu-gnome-live'
+		LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
+		KERNEL_FLAVOURS="$HWE_KERNEL_FLAVOUR"
 		case $ARCH in
-			amd64)	add_package live linux-signed-generic ;;
+			amd64)	add_package live $HWE_SIGNED_KERNEL_PACKAGE ;;
 		esac
 		COMPONENTS='main restricted universe'
 		;;
@@ -467,28 +527,41 @@
 		;;
 
 	ubuntu-mate)
+		HWE_BUILD="yes"
 		add_task install minimal standard ubuntu-mate-core ubuntu-mate-desktop
+		case $ARCH in
+			amd64|i386)	add_package install thermald ;;
+		esac
+		add_package install $HWE_X_PACKAGES
 		LIVE_TASK='ubuntu-mate-live'
+		LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
+		KERNEL_FLAVOURS="$HWE_KERNEL_FLAVOUR"
 		case $ARCH in
-			amd64)	add_package live linux-signed-generic ;;
+			amd64)	add_package live $HWE_SIGNED_KERNEL_PACKAGE ;;
 		esac
 		COMPONENTS='main restricted universe multiverse'
 		;;
 
 	ubuntustudio-dvd)
+		HWE_BUILD="yes"
 		add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-fonts ubuntustudio-graphics ubuntustudio-video ubuntustudio-publishing ubuntustudio-photography
+		add_package install $HWE_X_PACKAGES linux-generic-hwe-16.04-
 		COMPONENTS='main restricted universe multiverse'
 		case $ARCH in
-			amd64|i386)	KERNEL_FLAVOURS=lowlatency ;;
+			amd64|i386)	KERNEL_FLAVOURS=lowlatency-hwe-16.04 ;;
 		esac
 		;;
 
 	ubuntukylin)
+		HWE_BUILD="yes"
 		add_task install minimal standard ubuntukylin-desktop
+		add_package install $HWE_X_PACKAGES
 		add_package install ubuntukylin-default-settings
 		LIVE_TASK='ubuntukylin-live'
+		LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
+		KERNEL_FLAVOURS="$HWE_KERNEL_FLAVOUR"
 		case $ARCH in
-			amd64)	add_package live linux-signed-generic ;;
+			amd64)	add_package live $HWE_SIGNED_KERNEL_PACKAGE ;;
 		esac
 		COMPONENTS='main restricted universe'
 		;;
@@ -514,6 +587,7 @@
 		;;
 
 	ubuntu-core)
+<<<<<<< TREE
 		OPTS="${OPTS:+$OPTS }--apt-recommends false"
 
 		# some workarounds because the seeds are not quite
@@ -581,6 +655,83 @@
 			;;
 		esac
 		add_package install ubuntu-minimal ubuntu-touch $HINTS
+=======
+		# mvo: This is for cron.daily-preinstalled
+		#      CDIMAGE_PREINSTALLED is not passed from build.py
+		#      and PREINSTALLED means something different. So
+		#      we use SUBPROJECT to pass on the information
+		if [ "$SUBPROJECT" = "system-image" ]; then
+			OPTS="${OPTS:+$OPTS }--apt-recommends false"
+
+			# some workarounds because the seeds are not quite
+			# corrent at the moment
+			add_package install dbus
+			add_package install isc-dhcp-client
+			add_package install libpam-systemd
+			add_package install ppp
+			add_package install watchdog
+			# no Task: header yet
+			add_package install snapd
+			add_package install ubuntu-core-snapd-units
+
+			# no minimal as we want to be really minimal
+			#add_task install minimal
+			add_task install ubuntu-core
+
+                        # more packages are pulled in via the seed.
+                        # (important to remember when comparing to the
+                        #  livecd-rootfs from ppa:snappy-dev/image)
+
+			case $ARCH in
+				i386)
+					# efi support can go once the task
+					# header is available for grub-efi-ia32-bin
+					add_package install grub-efi-ia32-bin
+					;;
+			esac
+
+			# generic kernel etc
+			KERNEL_FLAVOURS=none
+			case $ARCH in
+				i386)
+					add_package install grub-pc
+					;;
+				amd64)
+					add_package install grub-pc-bin
+					add_package install grub-efi-amd64-signed
+					add_package install shim-signed
+					;;
+				armhf)
+					add_package install flash-kernel u-boot-tools
+					;;
+				arm64)
+					add_package install u-boot-tools
+                                        ;;
+			esac
+			OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none --initramfs-compression=none"
+
+			# contains the framework definition
+			add_package install ubuntu-core-libs
+
+			# universe needed for 'system-image-cli' and multiverse for firmware
+			COMPONENTS='main restricted universe multiverse'
+		fi
+		OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
+		;;
+
+	ubuntu-base)
+		OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
+		;;
+
+	ubuntu-touch|ubuntu-touch-custom)
+		HINTS="packagekit ubuntu-system-settings-online-accounts"
+		case $ARCH in
+			amd64|i386)
+				HINTS="$HINTS qml-module-ubuntu-components-gles unity8"
+				;;
+		esac
+		add_package install ubuntu-minimal ubuntu-touch $HINTS
+>>>>>>> MERGE-SOURCE
 
 		COMPONENTS='main restricted universe'
 		BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu'
@@ -612,6 +763,7 @@
 		;;
 
 	ubuntu-cpc)
+<<<<<<< TREE
 		if [ "${SUBPROJECT:-}" = minimized ]; then
 			add_task install cloud-image
 			add_package install sudo
@@ -639,6 +791,35 @@
 					;;
 			esac
 		fi
+=======
+		if [ "${SUBPROJECT:-}" = minimized ]; then
+			add_task install cloud-image
+			add_package install sudo
+			# linux-kvm currently only exists in xenial, not in
+			# non-LTS suites.  Fall back to virtual flavor, which
+			# may or may not boot initramfsless but enables us to
+			# test building and possibly build derivative images
+			# using other kernel flavors.
+			# If you enable an extra ppa, it is assumed that
+			# linux-kvm is available since you control the
+			# archive and can provide this metapackage as
+			# necessary.
+			if [ "$ARCH" != "amd64" ] || ([ -z "$EXTRA_PPAS" ] && [ "$SUITE" != xenial ]); then
+				KERNEL_FLAVOURS=virtual
+			else
+				KERNEL_FLAVOURS=kvm
+			fi
+		else
+			add_task install minimal standard cloud-image
+			add_package install ubuntu-minimal
+			KERNEL_FLAVOURS=virtual
+		        case $ARCH in
+				armhf|arm64|ppc64el|powerpc)
+					add_task install server
+					;;
+			esac
+		fi
+>>>>>>> MERGE-SOURCE
 
 		BINARY_REMOVE_LINUX=false
 		OPTS="${OPTS:+$OPTS }--initramfs=none"
@@ -649,6 +830,12 @@
 				;;
 			arm64)
 				add_package install flash-kernel
+<<<<<<< TREE
+=======
+				;;
+			powerpc)
+				KERNEL_FLAVOURS=powerpc64-smp
+>>>>>>> MERGE-SOURCE
 				;;
 		esac
 		OPTS="${OPTS:+$OPTS }--system=normal"
@@ -772,6 +959,7 @@
 		;;
 esac
 
+<<<<<<< TREE
 case $PROJECT:${SUBPROJECT:-} in
 	ubuntu-server:live)
 		;;
@@ -780,6 +968,20 @@
 		KERNEL_FLAVOURS=none
 		BINARY_REMOVE_LINUX=false
 		;;
+=======
+case $PROJECT in
+	ubuntu-server|ubuntu-core|ubuntu-base|ubuntu-touch|ubuntu-touch-custom)
+		case $SUBPROJECT in
+			system-image)
+				# keep the kernel for the system-image build
+				;;
+			*)
+				OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
+				KERNEL_FLAVOURS=none
+				BINARY_REMOVE_LINUX=false
+				;;
+		esac
+>>>>>>> MERGE-SOURCE
 esac
 
 add_chroot_hook update-apt-file-cache
@@ -817,8 +1019,13 @@
 	${KERNEL_FLAVOURS:+--linux-flavours "$KERNEL_FLAVOURS"} \
 	--initsystem none \
 	--bootloader "$BOOTLOADER" \
+<<<<<<< TREE
 	--initramfs-compression "${INITRAMFS_COMPRESSION:-lzma}" \
 	--cache false \
+=======
+	--initramfs-compression lzma \
+	--cache false \
+>>>>>>> MERGE-SOURCE
 	${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \
 	$OPTS \
 	"$@"
@@ -956,7 +1163,11 @@
 		fi
 		;;
 
+<<<<<<< TREE
 	ubuntu-touch:*|ubuntu-touch-custom:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*|ubuntu-server:live)
+=======
+	ubuntu-touch:*|ubuntu-touch-custom:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*)
+>>>>>>> MERGE-SOURCE
 		cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \
 			config/
 		if [ "$IMAGEFORMAT" = none ]; then

=== added file 'live-build/ubuntu-cpc/functions.OTHER'
--- live-build/ubuntu-cpc/functions.OTHER	1970-01-01 00:00:00 +0000
+++ live-build/ubuntu-cpc/functions.OTHER	2018-03-28 13:08:01 +0000
@@ -0,0 +1,320 @@
+# vi: ts=4 expandtab syntax=sh
+
+CLOUD_IMG_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
+IMAGE_SIZE=$((2252*1024**2))  # 2.2G (the current size we ship)
+
+rootfs_dev_mapper=
+loop_device=
+loop_raw=
+backing_img=
+
+clean_loops() {
+    local kpartx_ret
+    local kpartx_stdout
+
+    if [ -n "${backing_img}" ]; then
+        # sync before removing loop to avoid "Device or resource busy" errors
+        sync
+        kpartx_ret=""
+        kpartx_stdout=$(kpartx -v -d "${backing_img}") || kpartx_ret=$?
+        echo "$kpartx_stdout"
+        if [ -n "$kpartx_ret" ]; then
+            if echo "$kpartx_stdout" | grep -q "loop deleted"; then
+                echo "Suppressing kpartx returning error (#860894)"
+            else
+                exit $kpartx_ret
+            fi
+        fi
+        unset backing_img
+    fi
+
+    if [ -z "${rootfs_dev_mapper}" ]; then
+        return 0
+    fi
+
+    unset loop_device
+    unset loop_raw
+    unset rootfs_dev_mapper
+}
+
+create_empty_disk_image() {
+    # Prepare an empty disk image
+    dd if=/dev/zero of="$1" bs=1 count=0 seek="${IMAGE_SIZE}"
+}
+
+make_ext4_partition() {
+    device="$1"
+
+    mkfs.ext4 -F -b 4096 -i 8192 -m 0 -L cloudimg-rootfs -E resize=536870912 "$device"
+}
+
+mount_image() {
+    trap clean_loops EXIT
+    backing_img="$1"
+    local rootpart="$2"
+    kpartx_mapping="$(kpartx -s -v -a ${backing_img})"
+
+    # Find the loop device
+    loop_p1="$(echo -e ${kpartx_mapping} | head -n1 | awk '{print$3}')"
+    loop_device="/dev/loop$(echo ${loop_p1} | cut -b5)"
+    if [ ! -b ${loop_device} ]; then
+        echo "unable to find loop device for ${backing_img}"
+        exit 1
+    fi
+
+    # Find the rootfs location
+    rootfs_dev_mapper="/dev/mapper/${loop_p1%%[0-9]}${rootpart}"
+    if [ ! -b "${rootfs_dev_mapper}" ]; then
+        echo "${rootfs_dev_mapper} is not a block device";
+        exit 1
+    fi
+
+    # Add some information to the debug logs
+    echo "Mounted disk image ${backing_img} to ${rootfs_dev_mapper}"
+    blkid ${rootfs_dev_mapper}
+
+    return 0
+}
+
+setup_mountpoint() {
+    local mountpoint="$1"
+
+    mount --rbind --make-rslave /dev "$mountpoint/dev"
+    mount proc-live -t proc "$mountpoint/proc"
+    mount sysfs-live -t sysfs "$mountpoint/sys"
+    mount -t tmpfs none "$mountpoint/tmp"
+    mount -t tmpfs none "$mountpoint/var/lib/apt"
+    mount -t tmpfs none "$mountpoint/var/cache/apt"
+    mv "$mountpoint/etc/resolv.conf" resolv.conf.tmp
+    cp /etc/resolv.conf "$mountpoint/etc/resolv.conf"
+    chroot "$mountpoint" apt-get update
+
+}
+
+teardown_mountpoint() {
+    # Reverse the operations from setup_mountpoint
+    local mountpoint="$1"
+
+    # ensure we have exactly one trailing slash, and escape all slashes for awk
+    mountpoint_match=$(echo "$mountpoint" | sed -e's,/$,,; s,/,\\/,g;')'\/'
+    # sort -r ensures that deeper mountpoints are unmounted first
+    for submount in $(awk </proc/self/mounts "\$2 ~ /$mountpoint_match/ \
+                      { print \$2 }" | LC_ALL=C sort -r); do
+        umount $submount
+    done
+    mv resolv.conf.tmp "$mountpoint/etc/resolv.conf"
+}
+
+mount_partition() {
+    partition="$1"
+    mountpoint="$2"
+
+    mount "$partition" "$mountpoint"
+    setup_mountpoint "$mountpoint"
+}
+
+
+mount_disk_image() {
+    local disk_image=${1}
+    local mountpoint=${2}
+    mount_image ${disk_image} 1
+    mount_partition "${rootfs_dev_mapper}" $mountpoint
+
+    local uefi_dev="/dev/mapper${loop_device///dev/}p15"
+    if [ -b ${uefi_dev} -a -e $mountpoint/boot/efi ]; then
+        mount "${uefi_dev}" $mountpoint/boot/efi
+    fi
+
+    # This is needed to allow for certain operations
+    # such as updating grub and installing software
+    cat > $mountpoint/usr/sbin/policy-rc.d << EOF
+#!/bin/sh
+# ${CLOUD_IMG_STR}
+echo "All runlevel operations denied by policy" >&2
+exit 101
+EOF
+    chmod 0755 $mountpoint/usr/sbin/policy-rc.d
+
+}
+
+umount_partition() {
+    local mountpoint=${1}
+    teardown_mountpoint $mountpoint
+    umount -R $mountpoint
+    udevadm settle
+
+    if [ -n "${rootfs_dev_mapper}" -a -b "${rootfs_dev_mapper}" ]; then
+        # buildd's don't have /etc/mtab symlinked
+        # /etc/mtab is needed in order zerofree space for ext4 filesystems
+        [ -e /etc/mtab ] || ln -s /proc/mounts /etc/mtab
+
+        # both of these are likely overkill, but it does result in slightly
+        # smaller ext4 filesystem
+        e2fsck -y -E discard ${rootfs_dev_mapper}
+        zerofree ${rootfs_dev_mapper}
+    fi
+}
+
+umount_disk_image() {
+    mountpoint="$1"
+
+    local uefi_dev="/dev/mapper${loop_device///dev/}p15"
+    if [ -e "$mountpoint/boot/efi" -a -b "$uefi_dev" ]; then
+        umount --detach-loop "$mountpoint/boot/efi"
+    fi
+
+    if [ -e $mountpoint/usr/sbin/policy-rc.d ]; then
+        rm $mountpoint/usr/sbin/policy-rc.d
+    fi
+    umount_partition $mountpoint
+    clean_loops
+}
+
+modify_vmdk_header() {
+    # Modify the VMDK headers so that both VirtualBox _and_ VMware can
+    # read the vmdk and import them. The vodoo here is _not_ documented
+    # anywhere....so this will have to do. This is undocumented vodoo
+    # that has been learned by the Cloud Image team.
+
+    vmdk_name="${1}"
+    descriptor=$(mktemp)
+    newdescriptor=$(mktemp)
+
+    # Extract the vmdk header for manipulation
+    dd if="${vmdk_name}" of="${descriptor}" bs=1 skip=512 count=1024
+
+    # The sed lines below is where the magic is. Specifically:
+    #   ddb.toolsVersion: sets the open-vm-tools so that VMware shows
+    #       the tooling as current
+    #   ddb.virtualHWVersion: set the version to 7, which covers most
+    #       current versions of VMware
+    #   createType: make sure its set to stream Optimized
+    #   remove the vmdk-stream-converter comment and replace with
+    #       # Disk DescriptorFile. This is needed for Virtualbox
+    #   remove the comments from vmdk-stream-converter which causes
+    #       VirtualBox and others to fail VMDK validation
+
+    sed -e 's|# Description file.*|# Disk DescriptorFile|' \
+        -e '/# Believe this is random*/d' \
+        -e '/# Indicates no parent/d' \
+        -e '/# The Disk Data Base/d' \
+        -e 's|ddb.comment.*|ddb.toolsVersion = "2147483647"|' \
+            "${descriptor}" > "${newdescriptor}"
+
+    # The header is cannot be bigger than 1024
+    expr $(stat --format=%s ${newdescriptor}) \< 1024 > /dev/null 2>&1 || {
+        echo "descriptor is too large, VMDK will be invalid!"; exit 1; }
+
+    # Overwrite the vmdk header with our new, modified one
+    dd conv=notrunc,nocreat \
+        if="${newdescriptor}" of="${vmdk_name}" \
+        bs=1 seek=512 count=1024
+
+    rm ${descriptor} ${newdescriptor}
+}
+
+create_vmdk() {
+    # There is no real good way to create a _compressed_ VMDK using open source
+    # tooling that works across multiple VMDK-capable platforms. This functions
+    # uses vmdk-stream-converter and then calls modify_vmdk_header to produce a
+    # compatible VMDK.
+
+    src="$1"
+    destination="$2"
+    size="${3:-10240}"
+
+    streamconverter="/usr/share/pyshared/VMDKstream.py"
+    scratch_d=$(mktemp -d)
+    cp ${src} ${scratch_d}/resize.img
+
+    truncate --size=${size}M ${scratch_d}/resize.img
+    python ${streamconverter} ${scratch_d}/resize.img ${destination}
+    modify_vmdk_header ${destination}
+
+    qemu-img info ${destination}
+    rm -rf ${scratch_d}
+}
+
+create_derivative() {
+    # arg1 is the disk type
+    # arg2 is the new name
+    unset derivative_img
+    case ${1} in
+           uefi) disk_image="binary/boot/disk-uefi.ext4";
+                 dname="${disk_image//-uefi/-$2-uefi}";;
+              *) disk_image="binary/boot/disk.ext4";
+                 dname="${disk_image//.ext4/-$2.ext4}";;
+    esac
+
+    if [ ! -e ${disk_image} ]; then
+        echo "Did not find ${disk_image}!"; exit 1;
+    fi
+
+    cp ${disk_image} ${dname}
+    export derivative_img=${dname}
+}
+
+convert_to_qcow2() {
+
+    src="$1"
+    destination="$2"
+    qemu-img convert -c -O qcow2 -o compat=0.10 "$src" "$destination"
+    qemu-img info "$destination"
+}
+
+replace_grub_root_with_label() {
+    # When update-grub is run, it will detect the disks in the build system.
+    # Instead, we want grub to use the cloudimg-rootfs labelled disk
+    CHROOT_ROOT="$1"
+
+    # If boot by partuuid has been requested, don't override.
+    if [ -f $CHROOT_ROOT/etc/default/grub.d/40-force-partuuid.cfg ] && \
+           grep -q ^GRUB_FORCE_PARTUUID= $CHROOT_ROOT/etc/default/grub.d/40-force-partuuid.cfg
+    then
+        return 0
+    fi
+    sed -i -e "s,root=[^ ]*,root=LABEL=cloudimg-rootfs," \
+        "$CHROOT_ROOT/boot/grub/grub.cfg"
+}
+
+
+# When running update-grub in a chroot on a build host, we don't want it to
+# probe for disks or probe for other installed OSes.  Extract common
+# diversion wrappers, so this isn't reinvented differently for each image.
+divert_grub() {
+	CHROOT_ROOT="$1"
+
+	chroot "$CHROOT_ROOT" dpkg-divert --local \
+		--rename /usr/sbin/grub-probe
+	chroot "$CHROOT_ROOT" touch /usr/sbin/grub-probe
+	chroot "$CHROOT_ROOT" chmod +x /usr/sbin/grub-probe
+
+	chroot "$CHROOT_ROOT" dpkg-divert --local \
+		--divert /etc/grub.d/30_os-prober.dpkg-divert \
+		--rename /etc/grub.d/30_os-prober
+
+	# Divert systemd-detect-virt; /etc/kernel/postinst.d/zz-update-grub
+	# no-ops if we are in a container, and the launchpad farm runs builds
+	# in lxd.  We therefore pretend that we're never in a container (by
+	# exiting 1).
+	chroot "$CHROOT_ROOT" dpkg-divert --local \
+		--rename /usr/bin/systemd-detect-virt
+	echo "exit 1" > "$CHROOT_ROOT"/usr/bin/systemd-detect-virt
+	chmod +x "$CHROOT_ROOT"/usr/bin/systemd-detect-virt
+}
+
+undivert_grub() {
+	CHROOT_ROOT="$1"
+
+	chroot "$CHROOT_ROOT" rm /usr/sbin/grub-probe
+	chroot "$CHROOT_ROOT" dpkg-divert --remove --local \
+		--rename /usr/sbin/grub-probe
+
+	chroot "$CHROOT_ROOT" dpkg-divert --remove --local \
+		--divert /etc/grub.d/30_os-prober.dpkg-divert \
+		--rename /etc/grub.d/30_os-prober
+
+	rm "$CHROOT_ROOT"/usr/bin/systemd-detect-virt
+	chroot "$CHROOT_ROOT" dpkg-divert --remove --local \
+		--rename /usr/bin/systemd-detect-virt
+}

=== added file 'live-build/ubuntu-cpc/hooks/030-root-tarball.binary.OTHER'
--- live-build/ubuntu-cpc/hooks/030-root-tarball.binary.OTHER	1970-01-01 00:00:00 +0000
+++ live-build/ubuntu-cpc/hooks/030-root-tarball.binary.OTHER	2018-03-28 13:08:01 +0000
@@ -0,0 +1,27 @@
+#!/bin/bash -ex
+
+if [ -n "$SUBARCH" ]; then
+	echo "Skipping rootfs build for subarch flavor build"
+	exit 0
+fi
+
+. config/functions
+
+mkdir binary/boot/filesystem.dir
+cp -a chroot/* binary/boot/filesystem.dir
+
+setup_mountpoint binary/boot/filesystem.dir
+
+chroot binary/boot/filesystem.dir dpkg-divert --local --rename /usr/sbin/grub-probe
+chroot binary/boot/filesystem.dir touch /usr/sbin/grub-probe
+chroot binary/boot/filesystem.dir chmod +x /usr/sbin/grub-probe
+
+env DEBIAN_FRONTEND=noninteractive chroot binary/boot/filesystem.dir apt-get --purge remove --assume-yes '^linux-.*' 'linux-base+'
+env DEBIAN_FRONTEND=noninteractive chroot binary/boot/filesystem.dir apt-get --purge remove --assume-yes '^grub-.*'
+env DEBIAN_FRONTEND=noninteractive chroot binary/boot/filesystem.dir apt-get autoremove --purge --assume-yes
+chroot binary/boot/filesystem.dir mkdir /lib/modules
+
+chroot binary/boot/filesystem.dir rm /usr/sbin/grub-probe
+chroot binary/boot/filesystem.dir dpkg-divert --remove --local --rename /usr/sbin/grub-probe
+
+teardown_mountpoint binary/boot/filesystem.dir

=== modified file 'live-build/ubuntu-cpc/hooks/032-disk-image.binary'
--- live-build/ubuntu-cpc/hooks/032-disk-image.binary	2018-03-06 12:58:38 +0000
+++ live-build/ubuntu-cpc/hooks/032-disk-image.binary	2018-03-28 13:08:01 +0000
@@ -1,11 +1,17 @@
 #!/bin/bash -ex
 
+<<<<<<< TREE
 IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
 FS_LABEL="cloudimg-rootfs"
 
 . config/binary
 
 . config/functions
+=======
+. config/functions
+
+. config/binary
+>>>>>>> MERGE-SOURCE
 
 BOOTPART_START=
 BOOTPART_END=

=== modified file 'live-build/ubuntu-cpc/hooks/032-root-squashfs.binary'
--- live-build/ubuntu-cpc/hooks/032-root-squashfs.binary	2017-11-10 07:49:30 +0000
+++ live-build/ubuntu-cpc/hooks/032-root-squashfs.binary	2018-03-28 13:08:01 +0000
@@ -17,6 +17,7 @@
 	exit 0
 fi
 
+<<<<<<< TREE
 . config/functions
 
 mkdir binary/boot/squashfs.dir
@@ -39,6 +40,8 @@
 
 teardown_mountpoint binary/boot/squashfs.dir
 
+=======
+>>>>>>> MERGE-SOURCE
 squashfs_f="${PWD}/livecd.ubuntu-cpc.squashfs"
 squashfs_f_manifest="${squashfs_f}.manifest"
 

=== modified file 'live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary'
--- live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary	2018-03-06 12:58:38 +0000
+++ live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary	2018-03-28 13:08:01 +0000
@@ -9,12 +9,16 @@
         ;;
 esac
 
+<<<<<<< TREE
 IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
 FS_LABEL="cloudimg-rootfs"
 
 . config/binary
 
 . config/functions
+=======
+. config/functions
+>>>>>>> MERGE-SOURCE
 
 create_partitions() {
     disk_image="$1"
@@ -64,6 +68,7 @@
     efi_boot_dir="/boot/efi/EFI/BOOT"
     chroot mountpoint mkdir -p "${efi_boot_dir}"
 
+<<<<<<< TREE
     if [ "${SUBPROJECT:-}" = minimized ] && [ -n "$partuuid" ]; then
         # FIXME: code duplicated between 032-disk-image.binary
         # and 033-disk-image-uefi.binary.  We want to fix this to not
@@ -78,9 +83,30 @@
     # non-Secure Boot systems. If you need an extra module not already
     # provided or run into "Secure Boot policy forbids loading X" problems,
     # please file a bug against grub2 to include the affected module.
+=======
+    if [ "${SUBPROJECT:-}" = minimized ] && [ -n "$partuuid" ]; then
+        # FIXME: code duplicated between 032-disk-image.binary
+        # and 033-disk-image-uefi.binary.  We want to fix this to not
+        # have initramfs-tools installed at all on these images.
+        echo "partuuid found for root device; omitting initrd"
+        echo "GRUB_FORCE_PARTUUID=$partuuid" >> mountpoint/etc/default/grub.d/40-force-partuuid.cfg
+    fi
+
+    chroot mountpoint apt-get -y update
+
+    # The modules below only make sense on non-Secure Boot UEFI systems.
+    # Otherwise, with Secure Boot enabled GRUB will refuse to load them.
+    # Any modules already in debian/build-efi-images do not need to be listed.
+    # Furthermore, other modules such as terminal, video_* and efi_* are all
+    # already available.
+>>>>>>> MERGE-SOURCE
     case $ARCH in
         arm64)
             chroot mountpoint apt-get -qqy install --no-install-recommends grub-efi-arm64 grub-efi-arm64-bin
+<<<<<<< TREE
+=======
+            grub_modules="serial"
+>>>>>>> MERGE-SOURCE
             efi_target=arm64-efi
             ;;
         armhf)
@@ -89,10 +115,23 @@
             ;;
         amd64)
             chroot mountpoint apt-get install -qqy grub-efi-amd64-signed grub-efi-amd64 shim-signed
+<<<<<<< TREE
+=======
+            grub_modules="multiboot serial usb usb_keyboard"
+>>>>>>> MERGE-SOURCE
             efi_target=x86_64-efi
             ;;
     esac
 
+<<<<<<< TREE
+=======
+    cat << EOF >> mountpoint/etc/default/grub.d/50-cloudimg-settings.cfg
+${CLOUD_IMG_STR}
+# For Cloud Image compatability
+GRUB_PRELOAD_MODULES="${GRUB_PRELOAD_MODULES:-$grub_modules}"
+EOF
+
+>>>>>>> MERGE-SOURCE
     chroot mountpoint grub-install "${loop_device}" \
         --boot-directory=/boot \
         --efi-directory=/boot/efi \

=== modified file 'live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary'
--- live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary	2017-12-06 22:22:41 +0000
+++ live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary	2018-03-28 13:08:01 +0000
@@ -7,12 +7,16 @@
         ;;
 esac
 
+<<<<<<< TREE
 IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
 FS_LABEL="cloudimg-rootfs"
 
 . config/binary
 
 . config/functions
+=======
+. config/functions
+>>>>>>> MERGE-SOURCE
 
 create_partitions() {
     disk_image="$1"
@@ -30,8 +34,13 @@
     mkdir mountpoint
     mount_partition "${rootfs_dev_mapper}" mountpoint
 
+<<<<<<< TREE
     chroot mountpoint apt-get -qqy update
     chroot mountpoint apt-get -qqy install grub-ieee1275
+=======
+    chroot mountpoint apt-get -qqy update
+    chroot mountpoint apt-get -qqy install grub2
+>>>>>>> MERGE-SOURCE
     chroot mountpoint apt-get -qqy remove --purge grub-legacy-ec2
 
     # set the kernel commandline to use hvc0

=== modified file 'live-build/ubuntu-cpc/hooks/040-qcow2-image.binary'
--- live-build/ubuntu-cpc/hooks/040-qcow2-image.binary	2017-11-20 20:18:33 +0000
+++ live-build/ubuntu-cpc/hooks/040-qcow2-image.binary	2018-03-28 13:08:01 +0000
@@ -18,7 +18,16 @@
 		;;
 esac
 
-. config/functions
+<<<<<<< TREE
+. config/functions
+=======
+
+. config/functions
+
+if [ -f binary/boot/disk.ext4 ]; then
+    convert_to_qcow2 binary/boot/disk.ext4 livecd.ubuntu-cpc.disk1.img
+fi
+>>>>>>> MERGE-SOURCE
 
 if [ -f binary/boot/disk-uefi.ext4 ]; then
     convert_to_qcow2 binary/boot/disk-uefi.ext4 livecd.ubuntu-cpc.img

=== modified file 'live-build/ubuntu-cpc/hooks/040-vmdk-image.binary'
--- live-build/ubuntu-cpc/hooks/040-vmdk-image.binary	2018-03-20 18:30:27 +0000
+++ live-build/ubuntu-cpc/hooks/040-vmdk-image.binary	2018-03-28 13:08:01 +0000
@@ -3,14 +3,27 @@
 #
 # Generate VMDK files
 
-case ${SUBPROJECT:-} in
-    minimized)
-        echo "Skipping minimized $0 build as images won't boot with linux-kvm"
-        exit 0
-        ;;
-    *)
-        ;;
-esac
+<<<<<<< TREE
+case ${SUBPROJECT:-} in
+    minimized)
+        echo "Skipping minimized $0 build as images won't boot with linux-kvm"
+        exit 0
+        ;;
+    *)
+        ;;
+esac
+=======
+case ${SUBPROJECT:-} in
+    minimized)
+        echo "Skipping minimized $0 build as images won't boot with linux-kvm"
+        exit 0
+        ;;
+    *)
+        ;;
+esac
+
+extension="disk1.vmdk"
+>>>>>>> MERGE-SOURCE
 
 case $ARCH in
          amd64) ;;
@@ -18,6 +31,7 @@
                      exit 0;;
 esac
 
+<<<<<<< TREE
 case ${IMAGE_TARGETS:-} in
 	""|*vmdk*)
 		;;
@@ -26,6 +40,9 @@
 		exit 0
 		;;
 esac
+=======
+. config/functions
+>>>>>>> MERGE-SOURCE
 
 . config/functions
 

=== modified file 'live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary'
--- live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary	2018-03-20 18:30:27 +0000
+++ live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary	2018-03-28 13:08:01 +0000
@@ -9,20 +9,36 @@
 #
 # 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
-# well use them.
+<<<<<<< TREE
+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
+# well use them.
+=======
+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
+# well use them.
+>>>>>>> MERGE-SOURCE
 case $ARCH in
+<<<<<<< TREE
         amd64)
             ovf_id=94
             ovf_os_type="ubuntu64Guest"
@@ -41,6 +57,21 @@
 		;;
 esac
 
+=======
+        amd64)
+            ovf_id=94
+            ovf_os_type="ubuntu64Guest"
+            ovf_desc_bits=64 ;;
+        i386)
+            ovf_id=93
+            ovf_os_type="ubuntu32Guest"
+            ovf_desc_bits=32 ;;
+        *)
+            echo "OVA images are not supported for $ARCH yet.";
+            exit 0;;
+esac
+
+>>>>>>> MERGE-SOURCE
 cur_d=${PWD}
 my_d=$(dirname $(readlink -f ${0}))
 

=== modified file 'live-build/ubuntu-cpc/hooks/042-vagrant.binary'
--- live-build/ubuntu-cpc/hooks/042-vagrant.binary	2018-03-20 18:30:27 +0000
+++ live-build/ubuntu-cpc/hooks/042-vagrant.binary	2018-03-28 13:08:01 +0000
@@ -3,6 +3,7 @@
 #
 # Generate a generic Vagrant Box.
 #
+<<<<<<< TREE
 # Vagrant images are essentially nothing more than OVA's with extra-metadata
 # and some preinstalled packages.
 #
@@ -32,6 +33,28 @@
 		exit 0
 		;;
 esac
+=======
+# Vagrant images are essentially nothing more than OVA's with extra-metadata
+# and some preinstalled packages.
+#
+# We can't use the OVA's for Vagrant since Vagrant uses SSH to modify the
+# instance. This build step creates a cloud-config ISO so that Cloud-Init
+# will configure the initial user, creates meta-data that tells Vagrant how
+# to interact with the cloud-init created users, and finally create the OVA.
+#
+# For this step, we make a deriviative of binary/boot/disk.ext4 and install
+# 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
+>>>>>>> MERGE-SOURCE
 
 cur_d=${PWD}
 my_d=$(dirname $(readlink -f ${0}))
@@ -40,13 +63,27 @@
 # OVF. We have fancy Ubuntu-specific IDs in the OVF specification, we might as
 # well use them.
 case $ARCH in
-        amd64)
-           ovf_id=94
-           ovf_os_type="ubuntu64Guest"
-           ovf_desc_bits=64 ;;
-        *)
-           echo "Vagrant images are not supported for $ARCH yet."
-           exit 0;;
+<<<<<<< TREE
+        amd64)
+           ovf_id=94
+           ovf_os_type="ubuntu64Guest"
+           ovf_desc_bits=64 ;;
+        *)
+           echo "Vagrant images are not supported for $ARCH yet."
+           exit 0;;
+=======
+        amd64)
+           ovf_id=94
+           ovf_os_type="ubuntu64Guest"
+           ovf_desc_bits=64 ;;
+        i386)
+           ovf_id=93
+           ovf_os_type="ubuntu32Guest"
+           ovf_desc_bits=32 ;;
+        *)
+           echo "Vagrant images are not supported for $ARCH yet."
+           exit 0;;
+>>>>>>> MERGE-SOURCE
 esac
 
 . config/functions
@@ -54,49 +91,97 @@
 # Lets be safe about this
 box_d=$(mktemp -d)
 seed_d=$(mktemp -d)
-mount_d=$(mktemp -d)
-
-create_derivative "disk" "vagrant" #sets ${derivative_img}
-mount_disk_image ${derivative_img} ${mount_d}
-
-cleanup_vagrant() {
-    if [ -d "$mount_d" ]; then
-        umount_disk_image "$mount_d"
-    fi
-    rm -rf ${box_d} ${seed_d} ${mount_d} ${derivative_img}
-}
-trap cleanup_vagrant EXIT
-
-chroot ${mount_d} apt-get update
-# virtualbox-guest-utils Recommends: virtualbox-guest-x11, which we want to
-# avoid pulling into a cloud image.
-chroot ${mount_d} apt-get install --no-install-recommends -y virtualbox-guest-utils
-chroot ${mount_d} apt-get clean
-
-# Create and setup users inside the image.
-# Vagrant users expect a "vagrant" user with a "vagrant" username.
-# See https://www.vagrantup.com/docs/boxes/base.html
-# Note: We decided NOT to allow root login with a default password.
-chroot ${mount_d} adduser vagrant --disabled-password --gecos ""
-echo "vagrant:vagrant" | chroot ${mount_d} chpasswd
-
-# The vagrant user should have passwordless sudo.
-cat << EOF > ${mount_d}/etc/sudoers.d/vagrant
-vagrant ALL=(ALL) NOPASSWD:ALL
-EOF
-
-# Add the insecure vagrant pubkey to the vagrant user, as is expected by the
-# vagrant ecosystem (https://www.vagrantup.com/docs/boxes/base.html)
-chroot ${mount_d} chmod 0440 /etc/sudoers.d/vagrant
-chroot ${mount_d} mkdir -p /home/vagrant/.ssh
-cat << EOF > ${mount_d}/home/vagrant/.ssh/authorized_keys
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
-EOF
-chroot ${mount_d} chown -R vagrant:vagrant /home/vagrant/.ssh
-chroot ${mount_d} chmod 700 /home/vagrant/.ssh
-
-umount_disk_image "$mount_d"
-rmdir "$mount_d"
+<<<<<<< TREE
+mount_d=$(mktemp -d)
+
+create_derivative "disk" "vagrant" #sets ${derivative_img}
+mount_disk_image ${derivative_img} ${mount_d}
+
+cleanup_vagrant() {
+    if [ -d "$mount_d" ]; then
+        umount_disk_image "$mount_d"
+    fi
+    rm -rf ${box_d} ${seed_d} ${mount_d} ${derivative_img}
+}
+trap cleanup_vagrant EXIT
+
+chroot ${mount_d} apt-get update
+# virtualbox-guest-utils Recommends: virtualbox-guest-x11, which we want to
+# avoid pulling into a cloud image.
+chroot ${mount_d} apt-get install --no-install-recommends -y virtualbox-guest-utils
+chroot ${mount_d} apt-get clean
+
+# Create and setup users inside the image.
+# Vagrant users expect a "vagrant" user with a "vagrant" username.
+# See https://www.vagrantup.com/docs/boxes/base.html
+# Note: We decided NOT to allow root login with a default password.
+chroot ${mount_d} adduser vagrant --disabled-password --gecos ""
+echo "vagrant:vagrant" | chroot ${mount_d} chpasswd
+
+# The vagrant user should have passwordless sudo.
+cat << EOF > ${mount_d}/etc/sudoers.d/vagrant
+vagrant ALL=(ALL) NOPASSWD:ALL
+EOF
+
+# Add the insecure vagrant pubkey to the vagrant user, as is expected by the
+# vagrant ecosystem (https://www.vagrantup.com/docs/boxes/base.html)
+chroot ${mount_d} chmod 0440 /etc/sudoers.d/vagrant
+chroot ${mount_d} mkdir -p /home/vagrant/.ssh
+cat << EOF > ${mount_d}/home/vagrant/.ssh/authorized_keys
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
+EOF
+chroot ${mount_d} chown -R vagrant:vagrant /home/vagrant/.ssh
+chroot ${mount_d} chmod 700 /home/vagrant/.ssh
+
+umount_disk_image "$mount_d"
+rmdir "$mount_d"
+=======
+mount_d=$(mktemp -d)
+
+create_derivative "disk" "vagrant" #sets ${derivative_img}
+mount_disk_image ${derivative_img} ${mount_d}
+
+cleanup_vagrant() {
+    if [ -d "$mount_d" ]; then
+        umount_disk_image "$mount_d"
+    fi
+    rm -rf ${box_d} ${seed_d} ${mount_d} ${derivative_img}
+}
+trap cleanup_vagrant EXIT
+
+chroot ${mount_d} apt-get update
+# virtualbox-guest-utils Recommends: virtualbox-guest-x11, which we want to
+# avoid pulling into a cloud image.
+chroot ${mount_d} apt-get install --no-install-recommends -y virtualbox-guest-utils
+chroot ${mount_d} apt-get clean
+
+# Create and setup users inside the image.
+# Vagrant users expect a "vagrant" user with a "vagrant" username.
+# See https://www.vagrantup.com/docs/boxes/base.html
+# Note: We decided NOT to allow root login with a default password.
+# --disabled-password and --gecos need to be passed to avoid adduser
+# asking questions when running in an interactive shell
+chroot ${mount_d} adduser vagrant --disabled-password --gecos ""
+echo "vagrant:vagrant" | chroot ${mount_d} chpasswd
+
+# The vagrant user should have passwordless sudo.
+cat << EOF > ${mount_d}/etc/sudoers.d/vagrant
+vagrant ALL=(ALL) NOPASSWD:ALL
+EOF
+
+# Add the insecure vagrant pubkey to the vagrant user, as is expected by the
+# vagrant ecosystem (https://www.vagrantup.com/docs/boxes/base.html)
+chroot ${mount_d} chmod 0440 /etc/sudoers.d/vagrant
+chroot ${mount_d} mkdir -p /home/vagrant/.ssh
+cat << EOF > ${mount_d}/home/vagrant/.ssh/authorized_keys
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
+EOF
+chroot ${mount_d} chown -R vagrant:vagrant /home/vagrant/.ssh
+chroot ${mount_d} chmod 700 /home/vagrant/.ssh
+
+umount_disk_image "$mount_d"
+rmdir "$mount_d"
+>>>>>>> MERGE-SOURCE
 
 # Used to identify bits
 suite=$(chroot chroot lsb_release -c -s)

=== added file 'live-build/ubuntu-cpc/hooks/061-open-iscsi.chroot'
--- live-build/ubuntu-cpc/hooks/061-open-iscsi.chroot	1970-01-01 00:00:00 +0000
+++ live-build/ubuntu-cpc/hooks/061-open-iscsi.chroot	2018-03-28 13:08:01 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+#
+# Set InitiatorName to be runtime generated when iscsid first starts, so
+# that each cloud image gets a unique value
+#
+
+if [ -f /etc/iscsi/initiatorname.iscsi ]; then
+    echo "GenerateName=yes" > /etc/iscsi/initiatorname.iscsi
+fi

=== renamed file 'live-build/ubuntu-cpc/hooks/061-open-iscsi.chroot' => 'live-build/ubuntu-cpc/hooks/061-open-iscsi.chroot.moved'
=== modified file 'live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot'
--- live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot	2017-10-19 01:11:53 +0000
+++ live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot	2018-03-28 13:08:01 +0000
@@ -59,6 +59,7 @@
 _xchroot "${rootd}" sh -c 'rm -f /etc/ssh/ssh_host_[rd]sa_key*'
 
 ## --------------
+<<<<<<< TREE
 if [ "${SUBPROJECT:-}" != minimized ]; then
 	_xchroot "${rootd}" locale-gen en_US.utf8
 fi
@@ -68,6 +69,11 @@
 # should be C.UTF-8 for 17.10 and later.  For earlier releases, cloud-init may
 # override this.
 echo LANG="C.UTF-8" > "${rootd}/etc/default/locale"
+=======
+if [ "${SUBPROJECT:-}" != minimized ]; then
+	_xchroot "${rootd}" locale-gen en_US.utf8
+fi
+>>>>>>> MERGE-SOURCE
 
 ## --------------
 # set cloud-init to be on
@@ -130,6 +136,7 @@
    } > "${rootd}/etc/overlayroot.local.conf"
 fi
 
+<<<<<<< TREE
 # previous steps may have left a dangling symlink here with
 # SUBPROJECT=minimized and that breaks lb_chroot_hacks step
 if [ -L "${rootd}/boot/initrd.img" ] && [ ! -e "${rootd}/boot/initrd.img" ]; then
@@ -156,6 +163,34 @@
 
 	_xchroot "${rootd}" apt clean
 fi
+=======
+# previous steps may have left a dangling symlink here with
+# SUBPROJECT=minimized and that breaks lb_chroot_hacks step
+if [ -L "${rootd}/boot/initrd.img" ] && [ ! -e "${rootd}/boot/initrd.img" ]; then
+	rm "${rootd}/boot/initrd.img"
+fi
+
+if [ "${SUBPROJECT:-}" = minimized ]; then
+	# Remove various packages that we don't want in the minimized images.
+	# Some of these are tools that don't make sense by default
+	# non-interactively; some are libraries whose reverse-dependencies
+	# will have already been removed; open-vm-tools, it's a bug that this
+	# is in the common cloud seed because this should only be included
+	# in VMWare guest images, and we know none of the minimized images
+	# are targeted at VMWare.
+	_xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \
+		apt-mark auto '^lib.*' '^python*' vim-runtime 2>/dev/null
+	# FIXME: iso-codes is a dep of software-properties and shouldn't be
+	_xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \
+		apt-get -y autoremove --purge iso-codes xauth pastebinit \
+		plymouth open-vm-tools git shared-mime-info vim vim-common \
+		console-setup ncurses-term tmux screen policykit-1 \
+		xdg-user-dirs less run-one apport-symptoms \
+		ubuntu-cloudimage-keyring file
+
+	_xchroot "${rootd}" apt clean
+fi
+>>>>>>> MERGE-SOURCE
 
 #### END COMMON ARCH FUNCTIONS
 

=== modified file 'live-build/ubuntu-cpc/hooks/999-extras.binary'
--- live-build/ubuntu-cpc/hooks/999-extras.binary	2017-04-13 17:54:14 +0000
+++ live-build/ubuntu-cpc/hooks/999-extras.binary	2018-03-28 13:08:01 +0000
@@ -8,9 +8,14 @@
     exit 0
 fi
 
+<<<<<<< TREE
 export IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
 export CLOUD_IMG_STR="$IMAGE_STR"
 export FS_LABEL="cloudimg-rootfs"
+=======
+# Export the common functions to the extras
+. config/functions
+>>>>>>> MERGE-SOURCE
 
 # Cleaner execution
 /bin/run-parts --exit-on-error --regex ".*\.binary" "${extra_d}"

=== added symlink 'live-build/ubuntu-touch-custom'
=== target is u'ubuntu-touch/'
=== renamed symlink 'live-build/ubuntu-touch-custom' => 'live-build/ubuntu-touch-custom.moved'
=== modified file 'live-build/ubuntu-touch/hooks/00-uid-gid-fix.chroot_early'