Merge lp:~smoser/maas-images/trunk.moved2git into lp:maas-images

[Scott Moser]

maas-images has moved its development from bzr to git.

Please update your workflow to use git. Instead of
   bzr branch lp:maas-images
use:
   git clone https://git.launchpad.net/maas-images

This bzr repository is no longer functional.

[Andres Rodriguez (andreserl)]

+1 from my perspective. Our CI has now been updated to use git.

review: Approve

[Robert C Jennings (rcj)]

We'll want to do this next week on Tuesday so we're not travelling and we're awake. But this is great. I'll hold putting this in 'approved' until then though.

[Robert C Jennings (rcj)]

Scott, The 'git clone' cmd you include in this MP does not work today. On my system I need 'git clone lp:~maas-images-maintainers/maas-images'. Thoughts?

review: Needs Fixing

[Scott Moser (smoser)]

@Robert,

Fixed. I had to 'Configure Code' for the maas-images project and point it at lp:~maas-images-maintainers/maas-images/+git/maas-images

all set now.

[Scott Moser (smoser)]

Per Daniel on Friday 9-21:
  smoser: roaksoax: FYI, we won't want the bzr repo to go away for a week or two as we tie up loose ends.

I plan on merging this on Tuesday October 2.

[Robert C Jennings (rcj)]

review: Approve

[Scott Moser (smoser)]

just a reminder, i'll push this tomorrow (tuesday october 2).
at some point in the US/Eastern day

=== modified file 'README'
--- README	2017-10-06 20:42:21 +0000
+++ README	2018-09-21 12:24:04 +0000
@@ -1,224 +1,11 @@
-This builds maas ephemeral images from daily builds of cloud images.
-Ie, it creates stuff that goes on
-  http://maas.ubuntu.com/images/ephemeral-v2/daily
-from stuff on
-  http://cloud-images.ubuntu.com/daily
-
-== setup ==
-  Run './system-setup' to set up the system.
-  This will install necessary dependencies.
-
-  the tools expect that the 'bin' dir is in $PATH.
-
-    export PATH=$PWD/bin:$PATH
-
-== building images ==
-You can build images and kernel in one of 2 ways
-
-=== build a single release/arch combination ===
-This will build output for a single release and architecture.
-You must provide a url or file to use as the source image.
-
-  meph2-build arch release version source-image output.d
-
-example:
-  $ burl=http://cloud-images.ubuntu.com/daily/server/
-  $ meph2-build amd64 xenial 20160101 \
-     $burl/xenial/current/xenial-server-cloudimg-amd64-root.tar.xz \
-     xenial-output.d/
-
-This will build from source-image into output.d for 'arch' and 'release'.
-The 'version' provided is a serial (YYYYMMDD such as 20160101).
-source-image can be either a url or a local file of type 
-  '.tar.gz', '-root.tar.gz', or '-root.tar.xz' or '.img'
-
-In order to collect debian installer data you will need '--enable-di'.
-
-=== syncing against cloud-images.ubuntu.com ===
-This will pull the latest images down from cloud-images.ubuntu.com
-and build maas images and kernel data all in one go.  It only builds
-if it notices that maas images are out of date with cloud-images.
-To force a build, use '--target=force'
-
-  To run:
-    meph2-cloudimg-sync out.d
-
-    You can then add filters to the end, like 'release=trusty' or
-    'arch=amd64'.  The resultant out.d/streams/v1/ will have information
-    copied from maas.ubuntu.com for all other products, but will only
-    create new content for products that match the provided filters.
-
-  If the maas ephemeral data is up to date with the latest cloud image daily
-  then meph2-cloudimg-sync will not do anything.
-
-In order to 'rebuild' something.  To create a new '20160101.1' even when
-there is an existing '20160101' maas image and the latest cloud image
-is 20160101, then pass '--rebuild=20160101:20160101.1'.
-
-For faster debugging, you can disable the crawling of d-i kernel/initramfs
-by passing '--disable-di'
-
-=== debugging ===
-To debug and use the fake 'maas-cloudimg2eph2', run like:
-  env MAAS_CLOUDIMG2EPH2=fake-maas-cloudimg2eph2 meph2-cloudimg-sync out.d
-
-  This will still download di-kernels and di-initramfs.
-
-It will produce output that looks much like the final output, but
-runs in seconds rather than minutes.
-
-=== Enabling Proposed ===
-For development and test purposes using Ubuntu proposed or PPA can
-be very useful.
-
-You can enable the proposed archive by simply editing the config
-file conf/meph-v3.yaml and specifying '--conf=conf/meph-v3.yaml'.
-
-    enable_proposed: True
-
-Alternatively, you can simply pass '--proposed' to 'meph2-build' or
-to 'meph2-cloudimg-sync'.
-
-=== Adding PPAs ===
-You can build images with any number of PPAs added and additional
-packages installed into the image through the environment variables
-M2E_ADD_REPOS and M2E_ADD_PACKAGES which are read by
-maas-cloudimg2ephemeral.
-
-M2E_ADD_REPOS is a space-delimited list of repositories to pass
-to 'add-apt-repository'.  M2E_ADD_PACKAGES is a space-delimited
-list of packages that will be installed into the image, and will
-thus affect both the image and the initramfs produced from it.
-
-For example:
-
-    $ rel=xenial ; arch=amd64
-    $ burl=http://cloud-images.ubuntu.com/
-    $ file=$rel-server-cloudimg-amd64.squashfs
-    $ wget $burl/$rel/current/$rel-server-cloudimg-amd64.squashfs -O "$file"
-
-    $ export M2E_ADD_REPOS=ppa:smoser/lp1711760
-    $ meph2-build --config=conf/meph-v3.yaml \
-        $arch $rel $(date +"%Y%m%d") $file $rel-output.d/
-
-== streams management ==
-Building as above will create out.d that has *metadata* describing
-everything that is in the source stream and also the things that were
-just built.  data (images) will only be present for the newly built things.
-
-So after building new data and metadata, you'll then insert the new data into
-an existing stream.  This option (meph2-util insert) is additive only.
-
-
-=== insert data ===
-Given output of a meph2-cloudimg-sync command above in build-output.d
-and local daily stream directory daily-stream.d you can add the new data
-with:
-
-  meph2-util insert build-output.d daily-stream.d
-
-If you do not want to sign (create .gpg and .sjson files), then you will
-have to use '--no-sign'.
-
-You can use '--dry-run' to only report what would be done.
-
-=== Promoting Builds ===
-Promoting is done on a specific version of a product.
-You promote a daily build to a released build with a given label.
-Likely that label is 'release'.
-
-   # list the product-ids and version are available for promotion
-   $ sstream-query --output-format="%(product_name)s %(version_name)s" --max=1 \
-      daily.d/streams/v1/index.json arch=i386 | sort -u
-   com.ubuntu.maas.daily:v2:boot:12.04:i386:hwe-p 20140414
-   com.ubuntu.maas.daily:v2:boot:12.04:i386:hwe-q 20140414
-   com.ubuntu.maas.daily:v2:boot:12.04:i386:hwe-r 20140414
-   com.ubuntu.maas.daily:v2:boot:12.04:i386:hwe-s 20140414
-   com.ubuntu.maas.daily:v2:boot:13.10:i386:hwe-s 20140416
-   com.ubuntu.maas.daily:v2:boot:14.04:i386:hwe-t 20140416.1
-
-   # promote the listed version
-   $ meph2-util promote --label=release \
-        daily.d/streams/v1/index.json releases.d/ 20140414 \
-        product_name=com.ubuntu.maas.daily:v2:boot:12.04:i386:hwe-q
-
-
-== cleaning old images ==
-Cleaning is done in 2 parts:
-  * cleaning meta-data (removing entries from the products files)
-  * finding orphans: identify which files in the tree are no longer referenced.
-  * purging orphans: removing files that are known to have been orpaned for
-                     a given amount of time (3 days).
-
-=== cleaning meta-data ===
-
-clean-md is the meph-util subcommand that allows you to keep only a given
-number of builds.  For example, to keep the latest 3 versions of every
-product in the meta-data, you would run:
-
-  meph2-util clean-md --max=3 daily-sream.d/
-
-This *only* modifies the meta-data, it does not delete files, use find-orphans
-and reap-orphans for that.
-
-There is a --dry-run and --no-sign arguments also.
-
-=== finding orphans ===
-
-finding orphans creates a json formated file that contains a entry for each
-file that is no longer referenced, and a timestamp of "now" (when it was first
-found to be orphaned).
-
-Example usage:
- The following will populate my-orphans.json.  Subsequent runs will update
- my-orphans.json with any new items, but will not update first-orphaned
- timestamp.
-
-  $ meph2-util find-orphans my-orphans.json ./daily/ ./daily/streams/v1/*.json
-
-More complex usage:
- Its possible that 2 streams dirs could share a data directory, similar
- to the 'pool' concept of apt for debian packages.  For example, the following
- directory tree layout (note, 'path' elements would have 'data' in them in
- this example):
-
-   daily/
-     data -> ../data/
-     streams/v1/index.json
-     streams/v1/daily.json
-   released/
-     data -> ../data
-     streams/v1/index.json
-     streams/v1/released.json
-   data/
-     trusty/...
-     utopic/...
-
- Then, we could run meph-util find-orphans with:
-
-   $ meph2-util find-orphans my-orphans.json ./data/ \
-       ./daily/streams/v1/index.json released/streams/v1/index.json
-
- That will look through files in data/ that are not referenced by path
- elements in either the daily/streams/v1/ or released/streams/v1/ files.
-
- There is no --dry-run for finding orphans as it is non-destructive.
-
-
-=== cleaning / reaping orphans ===
-Reaping orphans is what actually removes files.  There is a '--dry-run' to
-indicate what would be done.
- 
-its usage is fairly simple.
-
-  $ meph2-util reap-orphans --older 7d my-orphans.json ./data/
-
-'--older' takes input like:
-   Ni
- Where N is a number and i can be one of:
-   d: days
-   h: hours
-   m: minutes
-   s: seconds
-
-The default is '3d'.
+****************************************************************************
+** maas-images has moved its development from bzr to git.                 **
+**                                                                        **
+** If you are seeing this message, it means you have checked out via bzr. **
+** Please update your workflow to use git.  Instead of                    **
+**   bzr branch lp:maas-images                                            **
+** use:                                                                   **
+**   git clone https://git.launchpad.net/maas-images                      **
+**                                                                        **
+** This bzr repository is no longer functional.                           **
+****************************************************************************

=== removed file 'README.di-scraping'
--- README.di-scraping	2015-06-01 18:43:11 +0000
+++ README.di-scraping	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-Part of the processes of creating maas ephemeral images and streams data
-is scraping the d-i installer data from an archive location.  This is not
-a very pretty process.  Part of that blame resides in the very un-clean
-data that has to be interpreted.
-
-The way this is currently handled is with an intermediate simplestreams
-stream.  The code in meph2/netinst.py.  It can be excercise for test with
-bin/netboot-mirror .
-
-For example:
- ./bin/netboot-mirror --dry-run -vvv --arches=i386 --releases=trusty out.d
-
-That will create a NetbootMirrorReader that will scrape i386 data for trusty
-mirror trusty from the mirrors specified in meph2/netinst.py HTTP_MIRRORS.
-
-The logging there is useful to see what is happening.
-
-
-== Details ==
-The d-i data lives at
- <mirror>/dists/<release><pocket>/installer-<arch>/
-Where <release> is like 'trusty' and <pocket> like '-updates', '' or
-'-proposed'.
-For example:
-  http://archive.ubuntu.com/ubuntu/dists/precise-updates/main/installer-i386/
-
-The NetbootReader scrapes apache html to get a list of d-i versions available
-like '20101020ubuntu136.20'.
-
-So given "version_dir" as the above mirro/dists/..../<version> 
-Then SHA256SUM and MD5SUM files are pulled from
-  <mirror>/dists/trusty/main/installer-i386/<version>/images/
-Example
-  http://archive.ubuntu.com/ubuntu/dists/precise-updates/main/installer-i386/20101020ubuntu136.20/images/
-
-Then, we try to extract clean data from each line in that sums file via
-the get_file_item_data method.
-
-The end result is that NetbootMirrorReader is a simplestreams mirror
-that can be read.
-
-It has products like:
-  com.ubuntu.installer:netboot:14.04:i386
-
-You can fully see this mirror by running:
-  netboot-mirror [--arches=i386] [--releases=trusty] out.d
-and looking in
-  out.d/streams/v1/com.ubuntu.installer:released:netboot.json
-
-== d-i data to maas ephemeral ==
-The 'bin/maas-cloudimg2ephemeral' program then uses this streams formated data
-from the NetbootMirrorReader to as a clean set of data. And re-forms that
-data to fit its purposes.
-
-The intermediate step of NetbootReader is not necessary, but the NetbootReader
-code existed previously from an attempt to provide that data in a consistent format.

=== removed file 'README.testing'
--- README.testing	2014-05-30 18:27:15 +0000
+++ README.testing	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-To get local copies of maas ephemerals, you can do:
-
-  burl=http://maas.ubuntu.com/images/ephemeral-v2
-  for stream in releases daily; do
-     sstream-mirror --no-item-download \
-        $burl/$stream/streams/v1/index.json "$stream.d"; done
-
-
-Then, to test promote you could do:
-   $ sstream-query --output-format="%(product_name)s %(version_name)s" --max=1 \
-      daily.d/streams/v1/index.json  arch=i386 | sort -u
-   com.ubuntu.maas.daily:v2:boot:12.04:i386:hwe-p 20140414
-   com.ubuntu.maas.daily:v2:boot:12.04:i386:hwe-q 20140414
-   com.ubuntu.maas.daily:v2:boot:12.04:i386:hwe-r 20140414
-   com.ubuntu.maas.daily:v2:boot:12.04:i386:hwe-s 20140414
-   com.ubuntu.maas.daily:v2:boot:13.10:i386:hwe-s 20140416
-   com.ubuntu.maas.daily:v2:boot:14.04:i386:hwe-t 20140416.1
-
-   $ sstream-query \
-        --output-format="%(product_name)s %(version_name)s/%(item_name)s" \
-        releases.d/streams/v1/index.json | sort -u > before
-
-   $ meph2-util promote --no-sign --skip-file-copy --label=release \
-        daily.d/streams/v1/index.json releases.d/ 20140414 \
-        product_name=com.ubuntu.maas.daily:v2:boot:12.04:i386:hwe-q
-
-   $ sstream-query \
-        --output-format="%(product_name)s %(version_name)s/%(item_name)s" \
-        releases.d/streams/v1/index.json | sort -u > after
-
-   That will add the provided product to the releases.d/streams/ data.
-   It will not copy the files because of '--skip-file-copy'.

=== removed file 'TODO'
=== modified file 'bin/fake-maas-cloudimg2eph2'
--- bin/fake-maas-cloudimg2eph2	2015-11-06 21:07:45 +0000
+++ bin/fake-maas-cloudimg2eph2	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-#!/bin/bash
-set -f
-
-error() { echo "$@" 1>&2; }
-
-short_opts="a:k:p:v"
-long_opts="arch:,kernel:,krd-pack:,manifest:,verbose"
-getopt_out=$(getopt --name "${0##*/}" \
-    --options "${short_opts}" --long "${long_opts}" -- "$@") &&
-    eval set -- "${getopt_out}" ||
-    { echo "bad arguments to $0"; exit 1; }
-
-gzip=true
-arch=""
-kernel=""
-manif=""
-kpacks=( )
-while [ $# -ne 0 ]; do
-    cur=$1
-    next=$2
-    case "$cur" in
-        -a|--arch) arch="$next"; shift;;
-        -k|--kernel) kernel=$next; shift;;
-        -p|--krd-pack) kpacks[${#kpacks[@]}]=$next; shift;;
-           --manifest) manif="$next"; shift;;
-           --no-gzip) gzip=false;;
-        --) shift; break;;
-    esac
-    shift;
-done
-
-src=$1
-root_gz=$2
-
-ensure_d() { local d=""; d=$(dirname "$1"); mkdir -p "$d"; }
-
-ensure_d "$root_gz"
-$gzip && gzip_prog="gzip -c" || gzip_prog="cat"
-
-error "src=$src arch=$arch kernel=$kernel output=$root_gz"
-dd if=/dev/zero bs=1024 count=1024 2>/dev/null | $gzip_prog > "$root_gz"
-if [ -n "$manif" ]; then
-   npkg=10
-   for((i=0;i<$npkg;i++)); do
-      printf "bogus-package-%02d\t0.$((($npkg-$i)%$npkg))\n" "$i"
-   done > "$manif"
-fi
-
-OIFS="$IFS"
-for kpack in "${kpacks[@]}"; do
-    flags=""
-    pkg=""; kout=""; iout=""; dtbs="";
-    IFS=","; set -- $kpack ; IFS="$OIFS"
-    error "kpack: $*"
-    while [ $# -ne 0 ]; do
-        case "$1" in
-           --dtb=*|--dtb)
-              [ "$1" = "--dtb" ] &&
-                 { data="$2"; shift; } || data="${1#--dtb=}"
-              echo "dtb-${data%%=*}" > "${data#*=}";;
-           -*) flags="$flags $1";;
-           *) 
-              if [ -z "$pkg" ]; then
-                 pkg="$1"
-              elif [ -z "$kout" ]; then
-                 kout="$1"
-                 ensure_d "$kout"
-                 echo "kernel: $pkg" > "$kout"
-              elif [ -z "$iout" ]; then
-                 iout="$1"
-                 ensure_d "$iout"
-                 echo "kernel: $pkg" > "$iout"
-              else
-                 error "confused by $*"
-              fi
-        esac
-        shift;
-    done
-    ensure_d "$kout"
-    ensure_d "$iout"
-    echo "kernel: $pkg" > "$kout"
-    echo "initrd: $pkg" > "$iout"
-done

=== target is u'moved-to-git'
=== modified file 'bin/img2squashfs'
--- bin/img2squashfs	2018-09-19 20:59:56 +0000
+++ bin/img2squashfs	1970-01-01 00:00:00 +0000
@@ -1,289 +0,0 @@
-#!/bin/bash
-
-VERBOSITY=1
-TEMP_D=""
-VALID_FORMATS=( auto img-tar root-image root-image-gz root-tar squashfs-image
-  dir )
-
-error() { echo "$@" 1>&2; }
-fail() { [ $# -eq 0 ] || error "$@"; exit 1; }
-
-Usage() {
-    cat <<EOF
-Usage: ${0##*/} [ options ] source-image output-squash-image
-
-   convert 'source-image' into a squashfs filesystem image.
-
-   source-image is a file in one of:
-     ${VALID_FORMATS[*]}
-
-   output-squash-image will be a squashfs image.
-
-   options:
-    -v | --verbose     increase verbosity
-    -f | --format   F  source-image is of format F. default: auto.
-                       must be one of:
-                         auto: determine based on file and name heuristics
-                         img-tar: tarball of root image (image file named .img)
-                         root-image: filesytem (ext[234] in a file)
-                         root-image-gz: root-image that is compressed with gzip
-                         root-tar: tarball of / (supports .tar.xz .tar.gz)
-                         squashfs-image: a squahsfs image (.squashfs)
-    -O | --owner    O   change ownership of output to O (user:group)
-
-   Example:
-     ${0##*/} --format=my.tar.gz my.squashfs
-EOF
-}
-
-bad_Usage() { Usage 1>&2; [ $# -eq 0 ] || error "$@"; return 1; }
-cleanup() {
-    [ -z "${TEMP_D}" -o ! -d "${TEMP_D}" ] || rm -Rf "${TEMP_D}"
-}
-
-ddebug() {
-    local level="$1"; shift;
-    [ "${level}" -gt "${VERBOSITY}" ] && return
-    error "$(date -R):" "$@"
-}
-
-debug() {
-    local level=${1}; shift;
-    [ "${level}" -gt "${VERBOSITY}" ] && return
-    error "${@}"
-}
-
-inargs() {
-    #inargs(needle, [haystack])
-    # return true if needle is in haystack
-    local needle="$1" i=""
-    shift
-    for i in "$@"; do
-        [ "$i" = "$needle" ] && return 0
-    done
-    return 1
-}
-
-get_img_from_tar() {
-    # given 'img' (image.tar.gz), extract it and put the .img file in 'out'
-    local img="$1" out="$2" tempd="$3"
-    local mtmp=$(mktemp -d "${tempd}/img_from_tar.XXXXXX")
-    tar -C "$mtmp" -Sxf "$img" ||
-        { error "failed to extract $img"; return 1; }
-    local f="" found=""
-    for f in "${mtmp}/"*; do
-        [ ! -f "$f" -o "${f%.img}" = "$f" ] && continue
-        [ -z "$found" ] ||
-            { error "multiple .img found in $img"; return 1; }
-        found="$f"
-    done
-    [ -n "$found" ] || { error "no .img in $img"; return 1; }
-    mv "$found" "$out" && rm -Rf "$mtmp"
-}
-
-determine_format() {
-    local input="$1" fmt="$2" fout=""
-    inargs "$fmt" "${VALID_FORMATS[@]}" || {
-        error "provided '--format=$fmt' not a valid format:" \
-            "${VALID_FORMATS[*]}"
-        return 1;
-    }
-    [ "$fmt" != "auto" ] && _RET="$fmt" && return 0
-    if [ -d "$input" ]; then
-        debug 1 "${input} is a directory";
-        _RET="dir"
-        return
-    fi
-    fout=$(LANG=C file "$input") ||
-        { error "failed: file $input"; return 1; }
-    case "${fout#$input: }" in
-        "gzip compressed"*)
-            fout=$(zcat "$input" | file -)
-            case "${fout#*: }" in
-                POSIX\ tar*) fmt="img-tar";;
-                *) fmt="root-image-gz";;
-            esac
-            ;;
-        "POSIX tar"*) fmt="img-tar";;
-        *ext[234]\ filesystem*) fmt="root-image";;
-        *[Ss]quashfs*) fmt="squashfs-image";;
-        *)
-            # if the above failed (on trusty a .tar.gz file was reported
-            # as a Minux file system) then try filename based heuristics
-            case "$input" in
-                *-root.t??|*-root.tar|*-root.tar.??) fmt="root-tar";;
-                *.tar.gz|*.tgz|*.tar) fmt="img-tar";;
-                *.gz) fmt="root-image-gz";;
-                *.squashfs) fmt="squashfs-image";;
-                *) 
-                    error "WARN: file '$input' did not match name hueristics"
-                    fmt="root-image";;
-            esac
-            debug 1 "guessing $input is $fmt based on name and 'file' [$fout]";;
-    esac
-    debug 1 "determined format is $fmt"
-    _RET="$fmt"
-}
-
-get_usable_input() {
-    # given 'input' in format 'fmt' return:
-    #  _RET_fmt: the format of _RET_path. either
-    #     fs-image : a mountable filesystem image.
-    #     dir : a directory
-    #  _RET_path: full path to a file in tempd
-    local input="$1" fmt="$2" tempd="$3" cmd=""
-    case "$fmt" in
-        img-tar)
-            _RET_fmt="fs-image"
-            _RET_path="fs-image"
-            get_img_from_tar "$input" "${tempd}/fs-image" "${tempd}"
-            return;;
-        root-image-gz)
-            _RET_fmt="fs-image"
-            _RET_path="$tempd/fs-image"
-            zcat -c "$input" > "$tempd/fs-image.tmp" &&
-                mv "$tempd/fs-image.tmp" "$tempd/fs-image"
-            return;;
-        root-image)
-            _RET_fmt="fs-image"
-            _RET_path="$tempd/fs-image"
-            ln -s "$(readlink -f "$input")" "${tempd}/fs-image"
-            return;;
-        squashfs-image)
-            _RET_fmt="squashfs-image"
-            _RET_path="${tempd}/fs-image"
-            ln -s "$(readlink -f "$input")" "${tempd}/fs-image"
-            return;;
-        root-tar)
-            _RET_fmt="dir"
-            _RET_path="${tempd}/fs-dir"
-            mkdir "${_RET_path}"
-            cmd=( tar -C "${_RET_path}" -xpSf "$input" \
-                --numeric-owner --xattrs "--xattrs-include=*" )
-            debug 1 "extracting $fmt with ${cmd[*]}"
-            "${cmd[@]}" || {
-                error "failed: extracting $fmt with ${cmd[*]}"
-                return 1;
-            }
-            return
-            ;;
-        dir)
-            _RET_fmt="dir"
-            _RET_path="${tempd}/fs-dir"
-            ln -s "$(readlink -f "$input")" "${tempd}/fs-dir"
-            return;;
-        *)
-            error "Unknown format '$fmt'";
-            return 1;;
-    esac
-}
-
-
-dir2squashfs() {
-    local src_d="$1" out="$2" owner="${3:-$(id -u):$(id -g)}"
-    local tmpfile ret="" cmd=""
-    tmpfile="${out}.${0##*/}.$$" || return
-    cmd=( mksquashfs "$src_d" "$tmpfile" -xattrs -comp xz )
-    ddebug 1 "starting: ${cmd[*]}"
-    "${cmd[@]}"
-    ret=$?
-    ddebug 1 "finished: returned $ret"
-    if [ $ret -eq 0 ]; then
-        chown "$owner" "$tmpfile" ||
-            { error "failed chown $owner $tmpfile"; return 1; }
-        mv "$tmpfile" "$out" ||
-            { error "failed to move file to $out"; return 1; }
-    else
-        rm -f "$tmpfile"
-        error "mksquashfs failed [$ret]: ${cmd[*]}."
-    fi
-    return $ret
-}
-
-fsimage2squashfs() {
-    local src="$1" out="$2" owner="$3"
-    local sudo="sudo"
-    [ "$(id -u )" = "0" ] && sudo=""
-    local cmd=""
-    cmd=( mount-image-callback "$src" --
-        "$0" dir2squashfs _MOUNTPOINT_ "$out" $owner )
-    debug 1 "calling ${cmd[*]}"
-    "${cmd[@]}"
-}
-
-main() {
-    local short_opts="hf:O:v"
-    local long_opts="help,format:,owner:,verbose"
-    local getopt_out=""
-    getopt_out=$(getopt --name "${0##*/}" \
-        --options "${short_opts}" --long "${long_opts}" -- "$@") &&
-        eval set -- "${getopt_out}" ||
-        { bad_Usage; return; }
-
-    local cur="" next="" input="" output="" owner="" fmt_in="auto" fmt=""
-    while [ $# -ne 0 ]; do
-        cur="$1"; next="$2";
-        case "$cur" in
-            -h|--help) Usage ; exit 0;;
-            -f|--format) fmt_in="$next"; shift;;
-            -O|--owner) owner="$next"; shift;;
-            -v|--verbose) VERBOSITY=$((${VERBOSITY}+1));;
-            --) shift; break;;
-        esac
-        shift;
-    done
-
-    [ $# -eq 2 ] || { bad_Usage "must provide input and output."; return; }
-    src_in="$1"
-    output="$2"
-
-    TEMP_D=$(mktemp -d "${TMPDIR:-/tmp}/${0##*/}.XXXXXX") ||
-        { error "failed to make tempdir"; return 1; }
-    trap cleanup EXIT
-    local tempd="${TEMP_D}"
-
-    determine_format "${src_in}" "${fmt_in}" || return
-    local fmt="${_RET}"
-    debug 1 "format of '${src_in}' is '$fmt'"
-
-    case "$fmt" in
-        dir|squashfs-image|root-tar) :;;
-        *)
-            [ "$(id -u)" = "0" ] || {
-                error "Cannot convert $fmt to squashfs as non-root";
-                return 1;
-            }
-    esac
-    get_usable_input "${src_in}" "$fmt" "$tempd" || return
-    local cfmt="${_RET_fmt}" tpath="${_RET_path}"
-
-    debug 1 "got format '$cfmt' at temp path '$tpath'"
-    if [ "$cfmt" = "squashfs-image" ]; then
-        local tmpf="$output.$$"
-        cp "$src_in" "$tmpf" &&
-            { [ -z "$owner" ] || chown "$owner" "$tmpf" ; } &&
-            mv "$tmpf" "$output"  || {
-                rm -f "$tmpf"
-                error "failed copying $src_in to $output"
-                return 1
-            }
-    elif [ -f "$tpath" ]; then
-        fsimage2squashfs "$tpath" "$output" "$owner" || return
-    elif [ -d "$tpath" ]; then
-        dir2squashfs "$tpath/" "$output" || return
-    else
-        error "failed. path='$tpath' cfmt=${cfmt}"
-        return 1
-    fi
-    error "output in $output. took ${SECONDS}s."
-    return 0
-}
-
-if [ "$1" = "dir2squashfs" ]; then
-    shift
-    dir2squashfs "$@"
-else
-    main "$@"
-fi
-
-# vi: ts=4 expandtab

=== target is u'moved-to-git'
=== modified file 'bin/kh-xgene'
--- bin/kh-xgene	2016-10-13 21:52:32 +0000
+++ bin/kh-xgene	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-cleanup() { [ -n "$TEMP_D" ] && rm -Rf "${TEMP_D}"; }
-error() { echo "$@" 1>&2; }
-fail() { [ $# -eq 0 ] || error "$@"; exit 1; }
-
-compress_type() {
-    local file="$1"
-    magic="$(od -x -N2 $file | head -1 | cut -d' ' -f2)"
-    case $magic in
-        8b1f)
-            echo "gzip"
-            ;;
-        *)
-            echo "none"
-            ;;
-    esac
-}
-
-TEMP_D=$(mktemp -d "${0##*/}.XXXXXX") &&
-	trap cleanup EXIT || exit 1
-
-kernel="$1"
-initrd="$2"
-info=${VERSION_FLAVOR:-"unknown-ver unknown-flavor"}
-
-cp "$kernel" "${TEMP_D}/kernel" ||
-	fail "failed copy kernel '$kernel'"
-cp "$initrd" "${TEMP_D}/initrd" ||
-	fail "failed copy initrd '$initrd'"
-
-comp="$(compress_type ${TEMP_D}/kernel)"
-mkimage -A arm -O linux -T kernel  -C $comp -a 0x80000 -e 0x80000 \
-    -n "kernel $info" -d "${TEMP_D}/kernel" "$kernel" ||
-	fail "failed mkimage for kernel";
-comp="$(compress_type ${TEMP_D}/initrd)"
-mkimage -A arm -O linux -T ramdisk -C $comp -a 0x0     -e 0x0 \
-    -n "ramdisk $info" -d "${TEMP_D}/initrd" "$initrd" ||
-	fail "failed mkimage for initrd";

=== target is u'moved-to-git'
=== modified file 'bin/kpack-from-image'
--- bin/kpack-from-image	2018-07-09 18:28:07 +0000
+++ bin/kpack-from-image	1970-01-01 00:00:00 +0000
@@ -1,565 +0,0 @@
-#!/bin/bash
-
-VERBOSITY=0
-TEMP_D=""
-COPY_TYPES="auto overlay qcow2 cp none"
-UBUNTU_MIRROR=${UBUNTU_MIRROR:-"http://archive.ubuntu.com/ubuntu/"}
-UBUNTU_MIRROR_PORTS=${UBUNTU_MIRROR_PORTS:-"http://ports.ubuntu.com/ubuntu-ports/"}
-PROPOSED_ARCHIVE_FILE="/etc/apt/sources.list.d/proposed.list"
-command -v unshare-pidns >/dev/null 2>&1 || PATH="${0%/*}:$PATH"
-
-error() { echo "$@" 1>&2; }
-fail() { [ $# -eq 0 ] || error "$@"; exit 1; }
-
-Usage() {
-    cat <<EOF
-Usage: ${0##*/} [ options ] image kernel-package out-dir
-
-  Install kernel-package into image and copy the generated kernel
-  and initrd out into out-dir
-    out-dir/
-      kernel
-      initrd
-      dtb-<filename>.dtb # for each file in lib/firmare/<ver>/device-tree
-
-  Requires sudo to invoke mount-image-callback.
-
-  options:
-     --kihelper PROG   invoke PROG with kernel and initrd
-                      This allows re-packing (ie, mkimage the files)
-                      PROG is invoked with 2 arguments:
-                        kernel-path initrd-path
-                      it will have in its environment:
-                        ROOT: path to the mounted 'image'
-                        VERSION_FLAVOR: a string like 3.13.0-29-generic 
-    --copy mode       use 'mode' to copy. default: auto
-                      one of: ${COPY_TYPES}
-                      overlay can be used only with mount-image-callback support
-EOF
-}
-
-bad_Usage() { Usage 1>&2; [ $# -eq 0 ] || error "$@"; return 1; }
-cleanup() {
-    [ -z "${TEMP_D}" -o ! -d "${TEMP_D}" ] || rm -Rf "${TEMP_D}"
-}
-
-debug() {
-    local level=${1}; shift;
-    [ "${level}" -gt "${VERBOSITY}" ] && return
-    error "${@}"
-}
-
-disable_services() {
-    local dir="$1"
-    cat > "$dir/usr/sbin/policy-rc.d" <<"EOF"
-#!/bin/sh
-while true; do
-    case "$1" in
-        -*) shift ;;
-        makedev) exit 0 ;;
-        x11-common) exit 0 ;;
-        *) exit 101 ;;
-    esac
-done
-EOF
-    [ $? -eq 0 ] && chmod 755 "$dir/usr/sbin/policy-rc.d" ||
-        { error "failed to write policy-rc.d"; return 1; }
-}
-
-undisable_services() {
-    local dir="$1"
-    rm -f "$dir/usr/sbin/policy-rc.d"
-}
-
-_chroot() {
-    local dir="$1"
-    shift
-    if [ "$dir" = "/" ]; then
-        "$@"
-    else
-        chroot "$dir" "$@"
-    fi
-}
-
-replace_newaliases() {
-    local dir="$1"
-    debug 1 "hacking around newaliases in root (LP: #1531299)"
-    _chroot "$dir" dpkg-divert --local --rename --add /usr/bin/newaliases &&
-        ln -s /bin/true "$dir/usr/bin/newaliases"
-}
-
-unreplace_newaliases() {
-    local dir="$1" chroot_dir=""
-    debug 1 "un-diverting newaliases in root"
-    [ "$dir/bin/true" -ef "$dir/usr/bin/newaliases" ] || return 0
-    rm -f "$dir/usr/bin/newaliases"
-    _chroot "$dir" dpkg-divert --local --rename --remove /usr/bin/newaliases
-}
-
-kernel_from_mp() {
-    # this is the unwrapped function that actually does everything
-    # it essentially gets called by mount-image-callback.
-    local short_opts="hv"
-    local long_opts="chown-to:,help,kihelper:,proposed,verbose"
-    local getopt_out=""
-    getopt_out=$(getopt --name "${0##*/}" \
-        --options "${short_opts}" --long "${long_opts}" -- "$@") &&
-        eval set -- "${getopt_out}" ||
-        { bad_Usage; return; }
-
-    local cur="" next=""
-    local output="" copy=true chown_to="" gid="" uid="" kihelper=""
-    local proposed="false"
-    local skip_update=${KPACK_SKIP_APT_UPDATE:-false}
-
-    while [ $# -ne 0 ]; do
-        cur="$1"; next="$2";
-        case "$cur" in
-               --chown-to) chown_to=$next; shift;;
-            -h|--help) Usage ; exit 0;;
-            -v|--verbose) VERBOSITY=$((${VERBOSITY}+1));;
-               --kihelper) kihelper="$next"; shift;;
-               --proposed) proposed=true;;
-               --skip-update) skip_update=true;;
-            --) shift; break;;
-        esac
-        shift;
-    done
-
-    [ $# -eq 3 ] ||
-        { bad_Usage "expected 3 args, got $# [$*]"; return; }
-    local mp="$1" kpkg="$2" outd="$3"
-
-    local me="" myd=""
-    me=$(readlink -f "$0") && myd="${me%/*}" ||
-        { error "couldn't figure out full path to $0"; return 1; }
-        
-    if [ -n "$kihelper" ]; then
-        if ! command -v "$kihelper" >/dev/null 2>&1 ; then
-            [ -x "$myd/$kihelper" ] ||
-                { error "failed to find kihelper"; return 1; }
-            kihelper="$myd/$kihelper"
-        fi
-    fi
-    if [ ! -d "$outd" ]; then
-        mkdir -p "$outd" ||
-            { error "failed mkdir $outd"; return 1; }
-        if [ -n "$chown_to" ]; then
-            chown "$chown_to" "$outd" || {
-                error "failed chown output dir '$outd' to '$chown_to'";
-                return 1;
-            }
-        fi
-    fi
-
-    local ch_outd="/tmp/output"
-    KPACK_SKIP_APT_UPDATE=$skip_update CHROOTED_VERBOSITY=$VERBOSITY \
-        PROPOSED=$proposed \
-        unshare-pidns \
-        chroot "$mp" /bin/bash -s chrooted "$kpkg" "$ch_outd" < "$me" ||
-        { error "failed chroot and kernel install"; return 1; }
-
-    if [ -n "$kihelper" ]; then
-        local verflav=""
-        read verflav < "$mp/$ch_outd/verflav"
-        debug 1 "using $kihelper verflav='$verflav'"
-        ROOT="$mp" VERSION_FLAVOR="$verflav" "$kihelper" \
-            "$mp/${ch_outd}/kernel" "$mp/${ch_outd}/initrd" ||
-        { error "$kihelper failed"; return 1; }
-    fi
-
-    if [ -n "$chown_to" ]; then
-        ( cd "$mp/$ch_outd" && chown "$chown_to" * ) || {
-            error "failed chown $mp/$ch_outd/*";
-            return 1;
-        }
-    fi
-
-    mv "$mp/$ch_outd/"* "$outd" ||
-        { error "failed move files from chrooted outdi '$ch_outd'"; return 1; }
-
-}
-
-config_addl_modules() {
-    local root="${1:-/}" rel="$2" fname=""
-    fname="${root%/}/etc/initramfs-tools/hooks/kpack_extra"
-    cat > "$fname" <<EOF
-#!/bin/sh
-. /usr/share/initramfs-tools/hook-functions
-
-copy_modules_dir kernel/drivers/char/ipmi # LP: #1333271
-copy_modules_dir kernel/drivers/net/usb   # LP: #1552378
-manual_add_modules bcache # LP: #1513176
-manual_add_modules hpilo  # LP: #1761639
-case $(dpkg --print-architecture) in
-    arm64)
-        manual_add_modules i2c-thunderx # LP: #1702976
-        ;;
-esac
-EOF
-    if [ "$rel" = "precise" ]; then
-        echo "manual_add_modules squashfs # (LP: #1501834)" >> "$fname"
-    fi
-    [ $? -eq 0 ] || { error "failed writing $fname"; return 1; }
-    chmod 755 "$fname" ||
-        { error "failed setting execute on $fname"; return 1; }
-
-    return 0
-}
-
-config_add_zfs() {
-    # In order for curtin to use zfs when booted in ephemeral we need the
-    # module included. This could also be achieved by zfs-initramfs package.
-    # However, that would bring in /sbin/zfs.  We do not need use the 'zfs'
-    # command or the kernel module *in* the initramfs, we just need the module
-    # present so it can be used in install environment (LP: #1737592).
-    local root="${1:-/}" rel="$2" fname=""
-    fname="${root%/}/etc/initramfs-tools/hooks/kpack_zfs"
-    case "$rel" in
-        precise|trusty) return 0;;
-    esac
-    debug 1 "Will include zfs modules for release $rel."
-    cat > "$fname" <<"EOF"
-. /usr/share/initramfs-tools/hook-functions
-
-manual_add_modules zfs # (LP: #1737592)
-EOF
-    [ $? -eq 0 ] || { error "failed writing to $fname for zfs"; return 1; }
-    chmod 755 "$fname" || {
-        error "failed adding execute to $fname for zfs";
-        return 1;
-    }
-}
-
-ensure_iscsi_initramfs_support() {
-    local root="${1:-/}"
-    local mfile="${root%/}/etc/iscsi/iscsi.initramfs"
-    if [ ! -f "$mfile" ]; then
-        mkdir -p "${mfile%/*}" && touch "$mfile" ||
-        { error "failed to create iscsi.initramfs"; return 1; }
-    fi
-}
-
-clean_local_udev_rules() {
-    # in wily and later, /etc/udev/rules.d/*.rules will be copied
-    # into the initramfs.  If there existed a '70-persistent-net.rules'
-    # then those would be clearly wrong (mac addresses and naming for
-    # the specific system that generated this).  Clean those out.
-    local root="${1:-/}"
-    rm -f "${root%/}/etc/udev/rules.d/70-persistent-net.rules"
-}
-
-insist_running_in_container() {
-    local root="${1:-/}"
-    ln -sf /bin/true "${root%/}/bin/running-in-container"
-
-    local sdv="/usr/bin/systemd-detect-virt"
-    local fpsdv="${root%/}${sdv}"
-    if [ -x "${fpsdv}" ]; then
-        # make 'systemd-detect-virt X' exit true for any value of
-        # X in -c/--container -r/--chroot
-        mv "${fpsdv}" "$fpsdv.real" && cat > "$fpsdv" <<"EOF"
-#!/bin/sh
-args=" $* "
-hasarg() { [ "${args#* $1 }" != "$args" -o "${args#* $2 }" != "$args" ]; }
-hasarg -q --quiet && msg=: || msg=echo
-hasarg -c --container && { $msg "lxc"; exit 0; }
-hasarg -r --chroot && { $msg "chroot"; exit 0; }
-exec "$0.real" "$@"
-EOF
-        [ $? -eq 0 ] || { error "failed writing $sdv"; return 1; }
-        chmod 755 "$fpsdv" || { error "failed chmod $fpsdv"; return 1; }
-    fi
-}
-
-vrun() {
-    local vlvl="$1" msg="$2" 
-    shift 2
-    debug $vlvl "$msg: $*"
-    "$@"
-}
-
-chrooted() {
-    # this is expected to run chrooted inside the root
-    # installs all packages (arguments), writes kernel
-    # and initramfs and 'verflav' to /tmp/ 
-    VERBOSITY=${CHROOTED_VERBOSITY:-${VERBOSITY}}
-    local pkgs="" kpkg="" copymods zzgrub emd="" out pkg rel arch
-    local skip_update=${KPACK_SKIP_APT_UPDATE:-false}
-    local proposed=${PROPOSED:-false} proposed_lfile="${PROPOSED_ARCHIVE_FILE}"
-    local verflav initrd kernel
-    export LANG=C
-    kpkg="$1"
-    outd="$2"
-    shift 2;
-    pkgs=( "$kpkg" "$@" )
-
-    mkdir -p "$outd" || { error "failed mkdir $outd"; return 1; }
-    local stamp="$outd/stamp"
-    touch "$stamp"
-
-    rel=$(lsb_release -sc) ||
-        { error "failed to read release"; return 1; }
-    arch=$(dpkg --print-architecture) ||
-        { error "failed to get architecture from dpkg"; return 1; }
-
-    # add proposed if necessary
-    if $proposed; then
-        local mirror=""
-        case "$arch" in
-            i?86|amd64) mirror="${UBUNTU_MIRROR}";;
-            *) mirror="${UBUNTU_MIRROR_PORTS}";;
-        esac
-        debug 1 "adding proposed ($mirror) to $proposed_lfile"
-        echo "deb $mirror ${rel}-proposed main universe multiverse" \
-            > "$proposed_lfile"
-        $skip_update && 
-            { skip_update=false; debug 1 "enabling update due to proposed"; }
-    fi
-
-    # trusty and wily do not have mdadm or lvm2 installed in the image
-    # but we want those modules included (LP: #1519470)
-    # the packages are expected to be in xenial already
-    case "$rel" in
-        precise|trusty|wily) pkgs=( lvm2 mdadm "${pkgs[@]}" );;
-    esac
-
-    $skip_update || apt-get update -q ||
-        { error "apt-get update failed"; return 1; }
-
-    copymods="cloud-initramfs-copymods"
-    if [ -f /usr/share/initramfs-tools/hooks/copymods ]; then
-        debug 1 "package '$copymods' already installed."
-    else
-        apt-cache show $copymods >/dev/null 2>&1 ||
-            { error "package '$copymods' not available."; return 1; }
-        debug 1 "adding package '$copymods'."
-        pkgs=( "$copymods" "${pkgs[@]}" )
-    fi
-
-    local rooturl="cloud-initramfs-rooturl"
-    if [ -f /usr/share/initramfs-tools/hooks/rooturl ]; then
-        debug 1 "package '$rooturl' already installed."
-    else
-        if ! apt-cache show $rooturl >/dev/null 2>&1; then
-            case "$rel" in
-                precise)
-                    debug 1 "package '$rooturl' not available on '$rel'";;
-                *)
-                    error "package '$rooturl' not available.";
-                    return 1;;
-            esac
-        else
-            debug 1 "adding package '$rooturl' (LP: #1688606)."
-            pkgs=( "$rooturl" "${pkgs[@]}" )
-        fi
-    fi
-
-    zzgrub=/etc/kernel/postinst.d/zz-update-grub
-    [ ! -x "$zzgrub" ] || chmod ugo-x $zzgrub
-
-    which eatmydata >/dev/null 2>&1 && emd=eatmydata
-
-    config_addl_modules / "$rel" ||
-        { error "failed configuring additional modules!"; return 1; }
-
-    config_add_zfs / "$rel" ||
-        { error "failed adding zfs"; return 1; }
-
-    ensure_iscsi_initramfs_support / ||
-        { error "failed to enable iscsi initramfs support"; return 1; }
-
-    clean_local_udev_rules / ||
-        { error "failed configuring additional modules!"; return 1; }
-
-    insist_running_in_container / ||
-        { error "failed to set running-in-container to true"; return 1; }
-
-    disable_services / ||
-        { error "failed to disable services before apt installs"; return 1; }
-
-    replace_newaliases / ||
-        { error "failed to replace newaliases"; return 1; }
-
-    vrun 1 "installing packages" \
-        env DEBIAN_FRONTEND=noninteractive FLASH_KERNEL_SKIP=1 \
-        $emd apt-get install --assume-yes --quiet \
-            "${pkgs[@]}" </dev/null
-    [ $? -eq 0 ] ||
-        { error "failed install of ${pkgs[*]}"; return 1; }
-
-    undisable_services / ||
-        { error "failed to re-enable services after apt installs"; return 1; }
-
-    unreplace_newaliases / ||
-        { error "failed to un-replace newaliases"; return 1; }
-
-    $proposed && rm -f "$proposed_lfile"
-
-    # here we look at all kernel files in /boot and get the package that
-    # owns it.  if the package is the kernel that was supplied, then we
-    # found it.  It supports 'kpkg' being a meta package by seeing
-    # if kpkg would be removed if we uninstalled the kernel package.
-    kernel=""
-    for f in /boot/vmlin*; do
-        [ -f "$f" ] || continue
-        out=$(dpkg -S "$f")
-        pkg=${out%%:*}
-        [ "$pkg" = "$kpkg" ] && kernel="$f" && break
-        if apt-get --dry-run remove $pkg | grep -q "Remv $kpkg "; then
-            kernel="$f"
-            break
-        fi
-    done
-    [ -z "$kernel" ] && { error "no kernel found!" 1>&2; return 1; }
-    verflav=${kernel#/boot/*-}
-    initrd="/boot/initrd.img-$verflav"
-    debug 2 "verflav is $verflav"
-    # LP: #1711203 - Prefer a signed kernel over an unsigned kernel. The signed
-    # kernel is created by combining the key in /usr/lib/linux and the kernel
-    # in /boot. As the kernel will not be in the dpkg database assume if it
-    # exists it's what we want.
-    if [ -f "$(ls $kernel*signed)" ]; then
-        kernel="$(ls $kernel*signed)"
-        debug 1 "Found signed kernel $kernel"
-    fi
-    if [ "$initrd" -ot "$stamp" ]; then
-        debug 1 "initramfs did not update by package install. regenerating."
-        update-initramfs -c -k "$verflav"
-    fi
-
-    [ -f "$initrd" ] || { error "no initrd for $verflav" 1>&2; return 1; }
-
-    local name="" t="" outf=""
-    for f in /boot/*-${verflav}*; do
-        # Skip unsigned kernel if a signed kernel is available.
-        [ -f "$f"*.signed ] && continue
-        t=$(basename "$f")
-        case "$t" in
-            vmlinu?*) name="kernel";;
-            initrd.img*) name="initrd";;
-            *)
-                # name is the basename with -${verfla} removed
-                name="${t%-${verflav}}"
-        esac
-        outf="$outd/$name"
-        debug 2 "$f -> $outf"
-        cp "$f" "$outf" && chmod ugo+r "$outf" ||
-            { error "failed to copy '$name' from '$f'"; return 1; }
-    done
-
-    local path="/lib/firmware/$verflav/device-tree"
-    if [ -d "$path" ]; then
-        for f in $(find "$path" -type f -name "*.dtb"); do
-            outf="$outd/dtb-${f##*/}"
-            debug 2 "$f -> $outf"
-            [ ! -f "$outf" ] || {
-                error "basename collision over '${outf##*/}'"
-                find "$path" -type f -name "${f##*/}" 1>&2
-                return 1
-            }
-            cp "$f" "$outf" && chmod ugo+r "$outf" ||
-                { error "failed to copy '$outf' from '$f'"; return 1; }
-        done
-    else
-        debug 1 "dtb path '$path' did not exist. assume no dtb files"
-    fi
-
-    echo "$verflav" > "$outd/verflav" ||
-        { error "failed to write verflavor"; return 1; }
-
-    rm -f "$stamp"
-}
-
-main() {
-    local short_opts="hv"
-    local long_opts="help,kihelper:,copy:,proposed,verbose"
-    local getopt_out=""
-    getopt_out=$(getopt --name "${0##*/}" \
-        --options "${short_opts}" --long "${long_opts}" -- "$@") &&
-        eval set -- "${getopt_out}" ||
-        { bad_Usage; return; }
-
-    local cur="" next="" vflags=""
-    local output="" copy=auto chown_to="" gid="" uid="" proposed_flag=""
-
-    while [ $# -ne 0 ]; do
-        cur="$1"; next="$2";
-        case "$cur" in
-            -h|--help) Usage ; exit 0;;
-            -v|--verbose) VERBOSITY=$((${VERBOSITY}+1)); vflags="${vflags}v";;
-               --kihelper) kihelper="$next"; shift;;
-               --copy) copy=$next; shift;;
-               --proposed) proposed_flag="--proposed";;
-            --) shift; break;;
-        esac
-        shift;
-    done
-
-    [ $# -eq 3 ] ||
-        { bad_Usage "expected 3 args, got $#"; return; }
-    local img="$1" kpkg="$2" outd=${3}
-
-    [ -z "$vflags" ] || vflags="-${vflags}"
-
-    TEMP_D=$(mktemp -d "${TMPDIR:-/tmp}/${0##*/}.XXXXXX") ||
-        fail "failed to make tempdir"
-    trap cleanup EXIT
-
-    if [ "$copy" = "auto" ]; then
-        if mount-image-callback --help | grep -q -- --overlay; then
-            copy="overlay"
-        elif command -v qemu-img >/dev/null 2>&1; then
-            copy="qcow"
-        else
-            copy="cp"
-        fi
-    fi
-
-    local imgfp myimg="${TEMP_D}/my.img" overlay_flags=""
-    imgfp=$(readlink -f "$img") ||
-        { error "failed to get full path to $img"; return 1; }
-    debug 1 "copy mode = $copy"
-    case "$copy" in
-        none) ln -s "$imgfp" "$myimg" ||
-            { error "failed link $imgfp -> $myimg"; return 1; };;
-        cp) cp --sparse=always "$img" "$myimg" ||
-            { error "failed cp '$img' to tempdir"; return 1; };;
-        qcow) 
-            qemu-img create -f qcow2 -b "$imgfp" "$myimg" ||
-                { error "failed create qcow2 backed by $img"; return 1; };;
-        overlay)
-            overlay_flags="--overlay --read-only"
-            ln -s "$imgfp" "$myimg" ||
-            { error "failed link $imgfp -> $myimg"; return 1; };;
-        *) error "bad copy type. one of: $COPY_TYPES"; return 1;;
-    esac
-
-    gid=$(id -g)
-    uid=$(id -u)
-    chown_to="$uid:$gid"
-
-    local mic=""
-    mic=$(which mount-image-callback) ||
-        { error "mount-image-callback not in PATH"; return 1; }
-    sudo \
-        "KPACK_SKIP_APT_UPDATE=${KPACK_SKIP_APT_UPDATE:-false}" \
-        "http_proxy=$http_proxy" PACKAGES="$kpkg" \
-        UBUNTU_MIRROR=${UBUNTU_MIRROR} \
-        UBUNTU_MIRROR_PORTS=${UBUNTU_MIRROR_PORTS} \
-        "$mic" --sys --proc $overlay_flags \
-            --system-resolvconf "$myimg" -- "$0" "kernel_from_mp" $vflags \
-            _MOUNTPOINT_ "--chown-to=$chown_to" \
-            ${kihelper:+"--kihelper=$kihelper"} ${proposed_flag} \
-            "$kpkg" "$outd" ||
-    { error "failed"; return 1; }
-
-    error "wrote to $outd"
-    error "  " $(cd "$outd" && echo *)
-    return
-}
-
-[ "$1" = "chrooted" ] && { shift; chrooted "$@"; exit; }
-[ "$1" = "kernel_from_mp" ] && { shift; kernel_from_mp "$@"; exit; }
-main "$@"
-# vi: ts=4 expandtab

=== target is u'moved-to-git'
=== modified file 'bin/maas-cloudimg2eph2'
--- bin/maas-cloudimg2eph2	2018-01-06 02:14:53 +0000
+++ bin/maas-cloudimg2eph2	1970-01-01 00:00:00 +0000
@@ -1,687 +0,0 @@
-#!/bin/bash
-
-VERBOSITY=1
-TEMP_D=""
-VALID_FORMATS=( auto img-tar root-image root-image-gz root-tar squashfs-image )
-CLOUDIMG_LABEL="cloudimg-rootfs"
-
-error() { echo "$@" 1>&2; }
-fail() { [ $# -eq 0 ] || error "$@"; exit 1; }
-
-Usage() {
-    cat <<EOF
-Usage: ${0##*/} [ options ] source-image output-image.gz
-
-   convert 'source-image' into a ephemeral image and put
-   output into output-image.gz.
-
-   source-image can be url or file path that is either .tar.gz or .img
-   or -root.tar.gz. or -root.tar.xz
-
-   options:
-         --no-gzip     do not gzip output image
-    -k | --kernel K    keep/install the kernel package 'k' inside image
-                       use 'none' to remove any existing kernels
-    -p | --krd-pack P  create a kernel / ramdisk pack
-                       P is ',' delimited: kernel-name,kernel,ramdisk[,flags]
-         --manifest M  write the dpkg manifest to M
-    -v | --verbose     increase verbosity
-    -f | --format   F  source-image is of format F. default: auto.
-                       must be one of:
-                         auto: determine based on file and name heuristics
-                         img-tar: tarball of root image (image file named .img)
-                         root-image: filesytem (ext[234] in a file)
-                         root-image-gz: root-image that is compressed with gzip
-                         root-tar: tarball of / (supports .tar.xz .tar.gz)
-                         squashfs-image: a squahsfs image (.squashfs)
-
-   Example:
-     ${0##*/} --kernel=linux-generic \\
-        --krd-pack=linux-generic,output/kernel,output/initrd \\
-        trusty-server-cloudimg-armhf.tar.gz \\
-        output/root-image.gz
-EOF
-}
-
-bad_Usage() { Usage 1>&2; [ $# -eq 0 ] || error "$@"; return 1; }
-cleanup() {
-    [ -z "${TEMP_D}" -o ! -d "${TEMP_D}" ] || rm -Rf "${TEMP_D}"
-}
-
-ddebug() {
-    local level="$1"; shift;
-    [ "${level}" -gt "${VERBOSITY}" ] && return
-    error "$(date -R):" "$@"
-}
-
-debug() {
-    local level=${1}; shift;
-    [ "${level}" -gt "${VERBOSITY}" ] && return
-    error "${@}"
-}
-
-mkfs_ext4() {
-    local out="" cmd="" feature_flags="" cfg="/etc/mke2fs.conf" fstype="ext4"
-    case "$1" in
-        --type=*) fstype=${1#--type=}; shift;;
-        --type) fstype="$2"; shift 2;;
-    esac
-
-    local target="$1" label="$2" uuid="$3"
-    if grep -q metadata_csum "$cfg"; then
-        # disable metadata_csum as yakkety will create this by default
-        # but kernels on some buildd cannot mount such a filesystem.
-        feature_flags="^metadata_csum"
-    fi
-    cmd=( "mkfs.$fstype"
-        ${label:+-L "$label"} ${uuid:+-U "$uuid"}
-        ${feature_flags:+-O "$feature_flags"}
-        -F "$target" )
-    debug 1 "creating $fstype fs in '$target'. label=$label" \
-            " feature_flags='${feature_flags}'"
-    debug 2 "mkfs cmd: ${cmd[*]}"
-
-    local ret=0
-    out=$("${cmd[@]}" 2>&1)
-    ret=$?
-    if [ $ret -ne 0 ]; then
-        error "failed [$ret]: ${cmd[*]}";
-        error "$out";
-    fi
-    return $ret
-}
-
-get_img_from_tar() {
-    local img="$1" out="$2" tempd="$3"
-    local mtmp=$(mktemp -d "${tempd}/img_from_tar.XXXXXX")
-    tar -C "$mtmp" -Sxf "$img" ||
-        { error "failed to extract $img"; return 1; }
-    local f="" found=""
-    for f in "${mtmp}/"*; do
-        [ ! -f "$f" -o "${f%.img}" = "$f" ] && continue
-        [ -z "$found" ] ||
-            { error "multiple .img found in $img"; return 1; }
-        found="$f"
-    done
-    [ -n "$found" ] || { error "no .img in $img"; return 1; }
-    mv "$found" "$out" && rm -Rf "$mtmp"
-}
-
-squashfs_to_image() {
-    local squashimg="$1" output="$2" tempd="$3" size="4G"
-    local mtmp=$(mktemp -d "${tempd}/root_tar_to_image.XXXXXX")
-    local xout="" ret=""
-    local srcmp="$mtmp/src" trgmp="$mtmp/target"
-    command -v unsquashfs >/dev/null 2>&1 || {
-        error "unsquashfs is not available. apt-get install squashfs-tools".
-        return 1;
-    }
-    truncate "--size=$size" "$output" || {
-        error "failed to create file of $size in $output"
-        return 1
-    }
-    mkdir "$srcmp" "$trgmp" || {
-        error "failed mkdir $srcmp $trgmp"
-        return 1;
-    }
-        
-    mkfs_ext4 "$output" "$CLOUDIMG_LABEL" || return
-    debug 1 "turning squahsfs image in $squashimg to ext4 image in $output"
-    sudo bash -ec 'src="$1"; img="$2"; trgmp="$3";
-        mounts=""
-        cleanup() { for m in $mounts; do umount "$m"; done; }
-        trap cleanup EXIT
-        mount -o loop "$img" "$trgmp"
-        mounts="$trgmp"
-        unsquashfs -force -xattrs -dest "$trgmp" "$src"' \
-        "squashimg-to-image" "$squashimg" "$output" "$trgmp"
-    ret=$?
-    rm -Rf "$mtmp" || return
-    return $ret
-}
-
-root_tar_to_image() {
-    local tball="$1" output="$2" tempd="$3" size="4G"
-    local mtmp=$(mktemp -d "${tempd}/root_tar_to_image.XXXXXX")
-    local mp="$mtmp/mp" xout="" ret=""
-    truncate "--size=$size" "$output" ||
-        return "failed to create file of $size in $output"
-    mkdir "$mp"
-    mkfs_ext4 "$output" "$CLOUDIMG_LABEL" || return
-    debug 1 "turning root tarball in $tball to image in $output"
-    sudo bash -ec 'tball="$1"; img="$2"; mp="$3";
-        mount -o loop "$img" "$mp"
-        trap "umount $mp" EXIT
-        tar -C "$mp" -xpSf "$tball" --numeric-owner \
-            --xattrs "--xattrs-include=*"' \
-        "root-tar-to-image" "$tball" "$output" "$mp"
-    ret=$?
-    rm -Rf "$mtmp" || return
-    return $ret
-}
-
-get_img_file() {
-    local fout="" fmt="$1" input="$2" output="$3" tempd="$4" ret=""
-    if [ "$fmt" = "auto" ]; then
-        fout=$(LANG=C file "$input") ||
-            { error "failed: file $input"; return 1; }
-        case "${fout#$input: }" in
-            "gzip compressed"*)
-                fout=$(zcat "$input" | file -)
-                case "${fout#*: }" in
-                    POSIX\ tar*) fmt="img-tar";;
-                    *) fmt="root-image";;
-                esac
-                ;;
-            "POSIX tar"*) fmt="img-tar";;
-            *ext[234]\ filesystem*) fmt="root-image";;
-            *[Ss]quashfs*) fmt="squashfs-image";;
-            *)
-                # if the above failed (on trusty a .tar.gz file was reported
-                # as a Minux file system) then try filename based heuristics
-                case "$input" in
-                    *-root.t??|*-root.tar|*-root.tar.??) fmt="root-tar";;
-                    *.tar.gz|*.tgz|*.tar) fmt="img-tar";;
-                    *.gz) fmt="root-image-gz";;
-                    *.squashfs) fmt="squashfs-image";;
-                    *) 
-                        error "WARN: file '$input' did not match name hueristics"
-                        fmt="root-image";;
-                esac
-                debug 1 "guessing $input is $fmt based on name and 'file' [$fout]";;
-        esac
-        debug 1 "determined format is $fmt"
-    fi
-    case "$fmt" in
-        img-tar)
-            get_img_from_tar "$input" "$output" "$tempd";;
-        root-image-gz)
-            zcat -c "$input" > "$output";;
-        root-image)
-            ln -s "$(readlink -f "$input")" "$output";;
-        root-tar)
-            root_tar_to_image "$input" "$output" "$tempd";;
-        squashfs-image)
-            squashfs_to_image "$input" "$output" "$tempd";;
-        *)
-            error "Unknown format '$fmt'";
-            return 1;;
-    esac
-    ret=$?
-    [ $ret -eq 0 ] || {
-        error "failed converting $fmt from $input to $output [$?]"
-        return $ret
-    }
-    _RET="$fmt"
-}
-
-ensure_file_d() {
-    local f="" d=""
-    for f in "$@"; do
-        d=$(dirname "$f")
-        mkdir -p "$d" || return
-    done
-    return 0
-}
-
-human2bytes() {
-    # converts size suitable for input to resize2fs to bytes
-    # s:512 byte sectors, K:kilobytes, M:megabytes, G:gigabytes
-    # none: block size of the image
-    local input=${1} defunit=${2:-1024}
-    local unit count;
-    case "$input" in
-        *s) count=${input%s}; unit=512;;
-        *K) count=${input%K}; unit=1024;;
-        *M) count=${input%M}; unit=$((1024*1024));;
-        *G) count=${input%G}; unit=$((1024*1024*1024));;
-        *)  count=${input}  ; unit=${defunit};;
-    esac
-   _RET=$((${count}*${unit}))
-}
-
-resize_image() {
-    # set image size to 'size'
-    #  if size is '+<size>', it will be grown by that size
-    #  if '--allow-padding' provided, then size will be
-    #    the minimum of "minimum_size + padding" or size
-    local padding=""
-    case "$1" in
-        --allow-padding=*) padding="${1#--allow-padding=}"; shift;;
-        --allow-padding) padding="$2"; shift 2;;
-    esac
-    local img="$1" size="$2" ret="" tok=":"
-    local oimgsize="" oblocks="" out="" blksize=""
-    local tbytes="" minblocks=""
-    out=$(ls -l "$img") && oimgsize=$(echo "$out" | awk '{print $5}') &&
-        [ -n "$oimgsize" ] ||
-        { error "failed to get size of $img"; return 1; }
-
-    case "$size" in
-        +*) human2bytes "${size#+}" ||
-                { error "failed convert '${size#+}' to bytes"; return 1; }
-            tbytes=$(($oimgsize+$_RET))
-            ;;
-        *) human2bytes "$size" ||
-                { error "failed convert '$size' to bytes"; return 1; }
-            tbytes=${_RET}
-            ;;
-    esac
-
-    if [ -n "$padding" ]; then
-        human2bytes "$padding" || {
-            error "failed convert '$padding' to bytes";
-            return 1;
-        }
-        padbytes=$_RET
-    fi
-
-    out=$(e2fsck -fy "$img" 2>&1) ||
-        { error "failed to e2fsck -fy '$img'"; error "$out"; return 1; }
-
-    out=$(LC_ALL=C dumpe2fs "$img" 2>/dev/null) ||
-        { error "failed 'dumpe2fs $img'"; return 1; }
-    oblocks=$(printf "%s\n" "$out" |
-        awk '$0 ~ /^Block count:/ { print $3 }') &&
-        [ -n "$oblocks" ] || {
-            error "failed to record blocks in $img"
-            return
-        }
-
-    blksize=$(printf "%s\n" "$out" |
-        awk '$0 ~ /^Block size:/ { print $3 }')
-
-    out=$(LC_ALL=C resize2fs -P "$img" 2>/dev/null) ||
-        { error "failed to get min image size"; return 1; }
-    minblocks=$(printf "%s\n" "$out" | awk '$0 ~ /minimum/ { print $NF }')
-    [ -n "$minblocks" ] ||
-        { error "failed to get min blocks in '$img'"; return 1; }
-
-    local tblocks=$(($tbytes/$blksize))
-    local des_blocks=$tblocks
-    if [ -n "$padding" ]; then
-        if [ $(($minblocks+($padbytes/$blksize))) -gt $tblocks ]; then
-            des_blocks=$((minblocks+($padbytes/$blksize)))
-            error "WARN: '--allow-padding=$padding'."
-            error "  minblocks=$minblocks target=$tblocks desired=$des_blocks"
-        elif [ $((minblocks+$(($padbytes/$blksize)))) -lt $tblocks ]; then
-            ddebug 1 "do not need pad, target=$tblocks > $minblocks+$padding"
-        fi
-    fi
-
-    if [ $des_blocks -lt $minblocks ]; then
-        error "target blocks '$tblocks' smaller than minblocks '$minblocks'"
-        error "fail: Could not resize to $size. ($tblocks * $blksize)"
-        error "  minblocks=$minblocks target=$tblocks desired=$des_blocks"
-        return 1
-    fi
-    tbytes=$(($des_blocks*$blksize))
-
-    ddebug 1 "targetting $tbytes ($des_blocks*$blksize) bytes."
-    ddebug 1 "fs is currently $oblocks * $blksize."
-    ddebug 1 "resize to $des_blocks. minblocks=$minblocks. target=$tblocks"
-
-    if [ "$oimgsize" -lt "$tbytes" ]; then
-        truncate --size=$tbytes "$img" ||
-            { error "failed to resize image to $tbytes"; return 1; }
-    fi
-
-    out=$(e2fsck -fy "$img" 2>&1) ||
-        { error "failed to e2fsck -fy '$img'"; error "$out"; return 1; }
-
-    out=$(resize2fs "$img" "$des_blocks" 2>&1) ||
-        { error "failed resize '$img'"; error "$out"; return 1; }
-
-    if [ "$oimgsize" -gt "$tbytes" ]; then
-        truncate --size=$tbytes "$img"
-    fi
-
-    out=$(e2fsck -fy "$img" 2>&1) ||
-        { error "failed to e2fsck -fy '$img'"; error "$out"; return 1; }
-
-    _RET="$oimgsize:$oblocks"
-}
-
-copy_filesystem_image() {
-    local src_img="$1" target_img="$2" size="${3:-1400M}"
-    local fstype="" label="" uuid="" tmpf="" out=""
-    tmpf=$(mktemp "${TMPDIR:-/tmp}/${0##*/}-copyfs.XXXXXX") ||
-        { error "mktemp failed"; return 1; }
-    blkid -o export "${src_img}" > "$tmpf" ||
-        { rm -f "$tmpf"; error "blkid ${src_img} failed"; return 1; }
-    out=$(UUID=""; TYPE=""; LABEL=""; . "$tmpf" && echo "$TYPE $UUID $LABEL")
-    [ $? -eq 0 ] || fail "failed reading blkid information for $src_img"
-    set -- ${out}
-    fstype="$1"
-    uuid="$2"
-    label="$3"
-    rm -f "$tmpf"
-
-    debug 1 "src image uuid=$uuid label=$label fstype=$fstype"
-    truncate "--size=$size" "$target_img" ||
-        { error "truncate $target_img $size failed"; return 1; }
-    case "$fstype" in
-        ext*) mkfs_ext4 "--type=$fstype" "$target_img" "$label" "$uuid";;
-        *) error "unknown filesystem type '$fstype'";;
-    esac
-
-    sudo bash -ec '
-        s_img=$1
-        t_img=$2
-        s_mp=""
-        t_mp=""
-        fail() { echo "$@" 1>&2; exit 1; }
-        cleanup() {
-            for t in "$t_mp" "$s_mp"; do [ -z "$t" ] || umount "$t"; done;
-            rm -Rf "$tmpd";
-        }
-
-        tmpd=$(mktemp -d "${TMPDIR:-/tmp}/${0##*/}.XXXXXX") &&
-            mkdir "$tmpd/src" "$tmpd/tgt" ||
-            fail "failed making tmpdir"
-        trap cleanup EXIT
-        mount -o loop,ro "$s_img" "$tmpd/src" && s_mp="$tmpd/src" ||
-            fail "failed mount $s_img";
-        mount -o loop "$t_img" "$tmpd/tgt" && t_mp="$tmpd/tgt" ||
-            fail "failed mount $t_img";
-        rsync -aXHAS "${s_mp}/" "${t_mp}/" ||
-            fail "failed copy data ${s_img} -> ${t_img}"' \
-        copy-source-to-target "$src_img" "$target_img" || {
-            error "copy data from $src_img -> $target_img failed"
-            return 1;
-        }
-}
-
-allow_resize_failure() {
-    local arch="$1" bdist="" barch=""
-    barch=${2:-$(uname -m)}
-    bdist=${3:-$(lsb_release -sc)}
-
-    local info="arch=$arch build-system=$bdist/$barch"
-    if [ "$arch" = "arm64" ] &&
-       [ "$barch" = "x86_64" -o -z "${barch#i?86}" ] &&
-       [ "$bdist" != "trusty" ]; then
-        error "***************************"
-        error "WARN: resize2fs fail allowed for $info"
-        error ""
-        error "resize2fs is less aggresive in versions"
-        error "newer than trusty: http://pad.lv/1415077"
-        error "***************************"
-        return 0
-    else
-        error "resize image failure not allowed for $info"
-        return 1
-    fi
-}
-
-handle_kpack() {
-    local short_opts="v"
-    local long_opts="dtb:,kihelper:,proposed"
-    local getopt_out=""
-    getopt_out=$(getopt --name "handle_kpack" \
-        --options "${short_opts}" --long "${long_opts}" -- "$@") &&
-        eval set -- "${getopt_out}" ||
-        { bad_Usage; return; }
-
-    local dtbs pt img outd ckpkg tkout tiout
-    dtbs=( )
-    pt=( )
-    while [ $# -ne 0 ]; do
-        cur="$1"; next="$2";
-        case "$cur" in
-               --proposed) pt[${#pt[@]}]="--proposed";;
-               --dtb) dtbs[${#dtbs[@]}]="$next"; shift;;
-               --kihelper) pt[${#pt[@]}]="$cur=$next"; shift;;
-            --) shift; break;;
-        esac
-        shift;
-    done
-    # tkout, tiout = target kernel out, target initrd out
-    img="$1"; ckpkg="$2"; tkout="$3"; tiout="$4"
-    shift 4
-    outd="${TEMP_D}/$ckpkg"
-    mkdir -p "$outd" ||
-        { error "failed tempdir for '$ckpkg'"; return 1; }
-
-    local cmd=""
-    cmd=( env kpack-from-image \
-             $vflags "${pt[@]}" "$imgfile" "$ckpkg" "$outd" )
-    ddebug 1 "$(date -R): starting ${cmd[*]}"
-    "${cmd[@]}" ||
-        { error "failed to get $ckpkg output"; return 1; }
-    ensure_file_d "$tkout" "$tiout" ||
-        { error "failed to make dirs for $tkout or $tiout"; return 1; }
-    mv "$outd/kernel" "$tkout" &&
-        mv "$outd/initrd" "$tiout" ||
-        { error "failed copying files"; return 1; }
-
-    local darg="" bname="" outf=""
-    for darg in "${dtbs[@]}"; do
-        # format is name=output. and kpack-from-image names
-        # files dtb-<name>
-        bname=${darg%%=*}
-        outf=${darg#*=}
-        ensure_file_d "$outf" || { error "failed mkdir for $outf"; return 1; }
-        if [ -f "$outd/dtb-$bname" ]; then
-            mv "$outd/dtb-$bname" "$outf" ||
-                { error "failed moving dtb-$bname to $outf"; return 1; }
-        elif [ -f "$outd/dtb-$bname.dtb" ]; then
-            mv "$outd/dtb-$bname.dtb" "$outf" ||
-                { error "failed moving dtb-$bname.dtb to $outf"; return 1; }
-        else
-            error "did not find dtb file $bname"
-            return 1;
-        fi
-    done
-}
-
-inargs() {
-    #inargs(needle, [haystack])
-    # return true if needle is in haystack
-    local needle="$1" i=""
-    shift
-    for i in "$@"; do
-        [ "$i" = "$needle" ] && return 0
-    done
-    return 1
-}
-
-main() {
-    local short_opts="a:fhk:p:v"
-    local long_opts="arch:,help,format:,kernel:,krd-pack:,manifest:,no-gzip,proposed,verbose"
-    local getopt_out=""
-    getopt_out=$(getopt --name "${0##*/}" \
-        --options "${short_opts}" --long "${long_opts}" -- "$@") &&
-        eval set -- "${getopt_out}" ||
-        { bad_Usage; return; }
-
-    local cur="" next="" output="" gzip=true kpkg=""
-    local kpacks="" src_in="" src="" arch="" vflags="" fmt="auto"
-    local working_space="1024M" zero_img="true" fs_img_size="1400M"
-    local manifest_out="" proposed_flag=""
-    kpacks=( )
-
-    while [ $# -ne 0 ]; do
-        cur="$1"; next="$2";
-        case "$cur" in
-            -h|--help) Usage ; exit 0;;
-            -a|--arch) arch="$next"; shift;;
-            -f|--format) fmt="$next"; shift;;
-            -k|--kernel) kpkg=$next; shift;;
-               --manifest) manifest_out="$next";;
-            -p|--krd-pack) kpacks[${#kpacks[@]}]="$next"; shift;;
-               --no-gzip) gzip=false;;
-               --proposed) proposed_flag="--proposed";;
-            -v|--verbose) VERBOSITY=$((${VERBOSITY}+1)); vflags="${vflags}v";;
-            --) shift; break;;
-        esac
-        shift;
-    done
-
-    [ $# -eq 2 ] || { bad_Usage "must provide source and target"; return; }
-    src_in="$1"
-    output="$2"
-    [ -z "$vflags" ] || vflags="-$vflags"
-
-    PATH="$(dirname "$0"):$PATH"
-    command -v "maas-cloudimg2ephemeral" >/dev/null 2>&1 ||
-        { error "do not have maas-cloudimg2ephemeral in path"; return 1; }
-
-    inargs "$fmt" "${VALID_FORMATS[@]}" || {
-        error "provided '--format=$fmt' not a valid format:" \
-            "${VALID_FORMATS[*]}"
-        return 1;
-    }
-
-    [ -z "$kpkg" ] && {
-        error "no '--kernel' provided, choosing 'linux-generic'"
-        kpkg="linux-generic"
-    }
-
-    TEMP_D=$(mktemp -d "${TMPDIR:-/tmp}/${0##*/}.XXXXXX") ||
-        { error "failed to make tempdir"; return 1; }
-    trap cleanup EXIT
-
-    if [ -f "$src_in" ]; then
-        src="$src_in"
-    else
-        case "$src_in" in
-            http://*|https://*|ftp://*)
-                ddebug 1 "getting source $src_in"
-                src="${TEMP_D}/${src_in##*/}"
-                wget "$src_in" --dot-style=mega -O "$src" ||
-                    { error "failed download $src_in"; return 1; }
-                ;;
-            file://*)
-                [ -f "${src_in#file://}" ] ||
-                    { error "$src_in: not a file"; return 1; }
-                src="${src_in#file://}"
-                ;;
-            *) error "Unable to handle src: $src_in"; return 1;;
-        esac
-    fi
-
-    # now src is either a .tar.gz file, a -root.tar.gz, or a .img file
-    local imgfile="${TEMP_D}/root.img"
-    ddebug 1 "getting .img from $src fmt=$fmt"
-    get_img_file "$fmt" "$src" "$imgfile" "${TEMP_D}" ||
-        { error "failed to get image file from $src"; return 1; }
-    fmt=${_RET}
-
-    if [ "$fmt" = "root-tar" ]; then
-        working_space=""
-    fi
-
-    if [ "$src" -ef "$imgfile" ]; then
-        rm -f "$imgfile"
-        ddebug 1 "copying $src_in to $imgfile"
-        cp --sparse=always "$src" "$imgfile" ||
-            { error "failed to copy $src_in to temp"; return 1; }
-        chmod u+w "$imgfile" ||
-            { error "failed to give write perms to $imgfile"; return 1; }
-    fi
-
-    ensure_file_d "$output" ||
-        { error "failed to create dir for $output"; return 1; }
-
-    local restore_img_info=""
-    if [ -n "$working_space" ]; then
-        ddebug 1 "getting '$working_space' in $imgfile"
-        resize_image "$imgfile" "+$working_space" ||
-            { error "failed to grow $imgfile by $working_space"; return 1; }
-        restore_img_info="$_RET"
-    fi
-
-    # now imgfile has the root filesystem image to adjust
-    local pkout="${TEMP_D}/$kpkg-kernel" piout="${TEMP_D}/$kpkg-initrd"
-    local manif="${TEMP_D}/manifest"
-    local mc2ephem=""
-    mc2ephem=( maas-cloudimg2ephemeral $vflags ${arch:+"--arch=$arch"}
-               $proposed_flag "$imgfile" "$kpkg" "$pkout" "$piout" "$manif" )
-    ddebug 1 "starting ${mc2ephem[*]}"
-    "${mc2ephem[@]}" ||
-        { error "failed to turn $imgfile to ephemeral"; return 1; }
-    [ -z "$manifest_out" ] || cp "$manif" "$manifest_out" ||
-        { error "failed copying manifest to $manifest_out"; return 1; }
-
-    local i="" oifs="$IFS"
-    ddebug 1 "starting kpacks: ${kpacks[*]}"
-    for i in "${kpacks[@]}"; do
-        IFS=","; set -- $i; IFS="$oifs"
-        # handle_kpack doesn't actually need $proposed_flag, because $imgfile
-        # will have it already enabled, but passing it is more obvious.
-        handle_kpack $proposed_flag "$imgfile" "$@" ||
-            { error "handle_kpack '$imgfile' $* failed"; return 1; }
-    done
-    ddebug 1 "kpacks done"
-
-    local pad="" tmp_img_size="$fs_img_size"
-    if [ "$arch" = "ppc64el" ]; then
-        ## ppc64el wily do not fit in 1400M. Instead of allowing this across
-        ## the board, we're going to keep the 1400M standard other places.
-        ## the 'pad' of 100M gives ~ 100M wiggle room in image.
-        tmp_img_size="1600M"
-        pad="100M"
-    fi
-    ddebug 1 "copying working img into new fs of $tmp_img_size (pad=$pad)"
-    local timg="$imgfile.fs_img_size"
-    copy_filesystem_image "$imgfile" "$timg" "$tmp_img_size" ||
-        error "failed copying $imgfile to $timg"
-
-    if [ -n "$pad" ]; then
-        ddebug 1 "adjusting image to fit $fs_img_size with pad=$pad"
-        resize_image "--allow-padding=$pad" "$timg" "$fs_img_size"
-    fi
-
-    if $zero_img; then
-        ddebug 1 "zeroing img"
-        e2fsck -fy "$imgfile" || { error "failed to e2fsck $imgfile"; return 1; }
-        zerofree "$imgfile" || { error "failed zerofree $imgfile"; return 1; }
-    fi
-
-    if [ "$fmt" = "squashfs-image" ]; then
-        local squash_out=""
-        squash_out=$(dirname "$output")/$(basename "$src")
-
-        # This is not perfect, but if these things imply a change
-        # to the image rather than re-using the input.
-        if [ -n "${proposed_flag}" ] ||
-           [ -n "${M2E_ADD_REPOS}" -o -n "${M2E_ADD_PACKAGES}" ]; then
-            debug 1 "creating a new squashfs in $squash_out from $imgfile"
-            sudo mount-image-callback "$imgfile" --read-only -- sh -ec '
-                src="$1"; out="$2"; owner="$3"; tmp="$out.$$"
-                trap "rm -f \"$tmp\"" EXIT
-                mksquashfs "$src" "$tmp" -xattrs -comp xz
-                chown "$owner" "$tmp"
-                mv "$tmp" "$out"
-                ' newsquash-img _MOUNTPOINT_ \
-                    "${squash_out}" "$(id -u):$(id -g)" || {
-                error "Failed mksquashfs from $imgfile"
-                return 1
-            }
-        else
-            cp "$src" "${squash_out}" || {
-                error "copy SquashFS image from $src -> $squash_out failed"
-                return 1;
-            }
-        fi
-    fi
-
-    if $gzip; then
-        ddebug 1 "gzipping image file"
-        local stime=$SECONDS
-        gzip -9 --rsyncable "$timg" &&
-            mv --force "$timg.gz" "$output" ||
-            { error "failed gzip"; return 1; }
-        ddebug 1 "gzip took $(($SECONDS-$stime))s"
-    else
-        mv --force "$timg" "$output" ||
-            { error "failed move to $output"; return 1; }
-    fi
-
-    ddebug 1 "finished"
-    return 0
-}
-
-main "$@"
-# vi: ts=4 expandtab

=== target is u'moved-to-git'
=== modified file 'bin/maas-cloudimg2ephemeral'
--- bin/maas-cloudimg2ephemeral	2018-07-09 18:28:07 +0000
+++ bin/maas-cloudimg2ephemeral	1970-01-01 00:00:00 +0000
@@ -1,725 +0,0 @@
-#!/bin/bash
-#
-# maas-cloudimg2ephemeral - update a cloud image to make it sufficient
-#                           for use as a maas ephemeral image
-#
-# Copyright (C) 2011-2012 Canonical
-#
-# Authors:
-#    Scott Moser <[e-mail]>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-_APT_UPDATED=false
-IMAGES_PPA_APT_KEY="-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: SKS 1.0.10
-
-mI0ETxf8lwEEAMAqtJVUnlCVzjTOsohaE/M4mGHFl4Py1cuE9ryOgmTWje+6BrNjtWLSfTQJ
-Kp1V6hViUoxPBck1qkZoAz7VU5nDuBWDybCsolliUX4zzTYNiDnPS74fs4CDUWx9qpl5Sdb6
-7aygIid/mFXubhJnTPR6Bq9ptGmc0Ks6ttNs3WJ/ABEBAAG0IkxhdW5jaHBhZCBQUEEgZm9y
-IE1hYVMgTWFpbnRhaW5lcnOIuAQTAQIAIgUCTxf8lwIbAwYLCQgHAwIGFQgCCQoLBBYCAwEC
-HgECF4AACgkQXP8eqZPujMU2zQP/W9OCzaU7HvFrqEt6nHGej2PEanIunxo7J8D5OR+Yl578
-FpRkHRgvcdQnGuZUpdBnOFatDDFME7ClN9qUrD1wDN1r9ip2luaKiO2cZOW4Uu5Z0n/3Qc6J
-eh9TNspyDMuHVVZ5GiAk+GXgF1m7ps5lCnOCZK/pXUEEUOS8AWnt3sM=
-=1RpZ
------END PGP PUBLIC KEY BLOCK-----"
-IMAGES_PPA_FILE="/etc/apt/sources.list.d/maas-ephemeral-images.list"
-IMAGES_PPA_URL="http://ppa.launchpad.net/maas-maintainers/maas-ephemeral-images/ubuntu"
-
-UBUNTU_MIRROR=${UBUNTU_MIRROR:-"http://archive.ubuntu.com/ubuntu/"}
-UBUNTU_MIRROR_PORTS=${UBUNTU_MIRROR_PORTS:-"http://ports.ubuntu.com/ubuntu-ports/"}
-PROPOSED_ARCHIVE_FILE="/etc/apt/sources.list.d/proposed.list"
-
-VERBOSITY=0
-TOP_D="${0%/*}"
-DISABLE_SUFFIX=".eph-temp-disabled"
-command -v unshare-pidns >/dev/null 2>&1 || PATH="${0%/*}:$PATH"
-
-error() { echo "$@" 1>&2; }
-errorp() { printf "$@" 1>&2; }
-fail() { [ $# -eq 0 ] || error "$@"; exit 1; }
-failp() { [ $# -eq 0 ] || errorp "$@"; exit 1; }
-
-Usage() {
-    cat <<EOF
-Usage: ${0##*/} [ options ] disk kpkg kernel initrd [manifest]
-
-   Update the image 'disk', installing 'kpkg'
-   copy out kernel and initramfs tothe kernel 'kernel' and initrd 'initrd'
-   If manifest is given, a (dpkg --show) manifest will be written.
-   
-   Expects to receive in a cloudimg disk image with no partition
-   table, and will update it for maas ephemeral use.
-
-   options:
-      -v | --verbose      increase verbosity
-EOF
-}
-
-bad_Usage() { Usage 1>&2; [ $# -eq 0 ] || error "$@"; return; }
-
-debug() {
-    local level=${1}; shift;
-    [ "${level}" -gt "${VERBOSITY}" ] && return
-    error "$(date -R):" "${@}"
-}
-
-disable_services() {
-    local dir="$1"
-    cat > "$dir/usr/sbin/policy-rc.d" <<"EOF"
-#!/bin/sh
-while true; do
-    case "$1" in
-        -*) shift ;;
-        makedev) exit 0 ;;
-        x11-common) exit 0 ;;
-        *) exit 101 ;;
-    esac
-done
-EOF
-    [ $? -eq 0 ] && chmod 755 "$dir/usr/sbin/policy-rc.d" ||
-        { error "failed to write policy-rc.d"; return 1; }
-
-    ( set -e;
-      cd "$dir"
-      for f in ./etc/kernel/*.d/*-grub; do
-           [ -x "$f" ] || continue
-           abs=${f#.}
-           debug 2 "Disabling $abs via dpkg-divert rename"
-           chroot "$dir" dpkg-divert --local --rename --divert \
-               "${abs}${DISABLE_SUFFIX}" "${abs}"
-      done
-    )
-}
-
-undisable_services() {
-    local dir="$1"
-    rm -f "$dir/usr/sbin/policy-rc.d"
-
-    ( set -e;
-      cd "$dir"
-      for f in ./etc/kernel/*.d/*${DISABLE_SUFFIX}; do
-           [ -e "$f" ] || continue
-           abs=${f#.}
-           orig=${abs%${DISABLE_SUFFIX}}
-           debug 2 "Re-enabling $orig via dpkg-divert removal."
-           chroot "$dir" dpkg-divert --local --remove --rename --divert \
-               "${abs}" "${orig}"
-      done
-    )
-}
-
-check_required_vars() {
-    local req="" missing=""
-    for req in "$@"; do
-        [ -n "${!req}" ] || missing="${missing} ${req}"
-    done
-    missing=${missing# }
-    _RET="$missing"
-    [ -z "$_RET" ]
-}
-
-show_vars() {
-    local var
-    for var in "$@"; do
-       printf "%s=%s\n" "$var" "${!var}"
-    done
-}
-
-_apt_update() {
-    if [ "${_APT_UPDATED}" != "true" ]; then
-        log_change true "run apt-update${1:+ [$1]}."
-        _apt update
-        _APT_UPDATED=true
-    fi
-}
-
-_apt() {
-    local emd=$(which eatmydata 2>/dev/null || :)
-    case "$1" in
-        upgrade|dist-upgrade|install) _apt_update "$1";;
-    esac
-    debug 1 "$emd apt-get ${apt_opts} --quiet --assume-yes $*"
-    $emd apt-get ${apt_opts} -q --assume-yes "$@" </dev/null;
-}
-
-log_change() {
-    local change="$1"
-    shift
-    if $change; then
-       echo "CHANGE:" "$@"
-    else
-       echo "NO_CHANGE:" "$@"
-    fi
-}
-
-filter_installed_packages() {
-    # write to stdout, a list of packages not installed locally
-    local fmt='${Package} ${Version}\n'
-    LC_ALL=C dpkg-query --show "--showformat=${fmt}" "$@" 2>&1 | awk '
-        $0 ~ /[Nn]o packages/ {
-            sub("[.]$","",$NF);
-            pkgs[n]=$NF;
-            n=n+1;
-        }
-        $2 == "" {
-                pkgs[n]=$1;
-                n=n+1;
-        };
-        END { for(p in pkgs) {printf("%s ",pkgs[p])}; printf("\n"); }' n=0
-}
-
-get_new_pkgs() {
-    # get_new_pkgs(manifest_in, manifest_out)
-    # return a list of packages in manifest_out that are not in manifest_in
-    _RET=$(set -o pipefail
-        cat "$1" "$1" "$2" | awk '-F\t' '{print $1}' | sort | uniq -u) &&
-        (set -f; echo $_RET)
-}
-get_removed_pkgs() {
-    # get_removed_pkgs(manifest_in, manifest_out)
-    # return a list of packages manifest_in not in manifest_out
-    _RET=$(set -o pipefail
-        cat "$1" "$2" "$2" | awk '-F\t' '{print $1}' | sort | uniq -u) &&
-        (set -f; echo $_RET)
-}
-
-ensure_iscsi_initramfs_support() {
-    local root="${1:-/}" release="$2"
-    local fname="/etc/iscsi/iscsi.initramfs"
-    local mfile="${root%/}$fname"
-    local change="touch $fname for iscsi root shutdown (LP: #1536707)"
-    if [ -f "$mfile" ]; then
-        log_change false "$change" "[file existed]"
-        return 0
-    fi
-    case "$release" in
-        precise|quantal|raring|saucy|trusty|utopic) :;;
-        *)
-            log_change false "$change" "[systemd]"
-            return 0
-            ;;
-    esac
-    mkdir -p "${mfile%/*}" && touch "$mfile" || 
-    { error "failed to create iscsi.initramfs"; return 1; }
-    log_change true "$change"
-}
-
-add_repos() {
-    local repos="$1"
-    (
-    # repos can be space or , delimited
-    oifs="$IFS"
-    set -f
-    set -e
-    case "$repos" in
-        *,*) IFS=","; set -- $repos; IFS="$oifs";;
-        *) set -- $repos; IFS="$oifs";
-    esac
-    log_change true "$change: $repos"
-    for i in "$@"; do
-        debug 1 "  $i"
-        add-apt-repository -y "$i" </dev/null
-    done
-    )
-}
-
-apply_updates_chrooted() {
-    # FIXME: remove this after no longer necessary
-    local required="" known=""
-    local release="" arch="" VERBOSITY=${_VERBOSITY:-1}
-    local ppa_clear=${PPA_CLEAR:-true} change="" dist_upgrade=${DIST_UPGRADE:-false}
-    local proposed=${proposed:-false}
-    local repos="${m2e_repos}" add_packages="${m2e_add_packages}"
-    required="kpkg pubd"
-    known="apt_opts PPA_CLEAR VERBOSITY DIST_UPGRADE"
-
-    export LC_ALL=C FLASH_KERNEL_SKIP=1
-    export DEBIAN_FRONTEND=noninteractive
-
-    check_required_vars ${required} ||
-        { error "$FUNCNAME: missing required vars: $_RET"; return 1; }
-
-    if [ "$VERBOSITY" -ge 1 ]; then
-        show_vars $required $known 1>&2
-    fi
-    
-    release=$(lsb_release -sc) ||
-        { error "failed to get release"; return 1; }
-
-    arch="$(dpkg --print-architecture)" ||
-        { error "failed to get dpkg arch"; return 1; }
-
-
-    mkdir -p "$pubd" || { error "failed to create pubdir '$pubd'"; return 1; }
-
-    dpkg-query --show > "$pubd/manifest.in"
-    
-    change="add additional repos."
-    if [ -n "$repos" ]; then
-        add_repos "$repos" || {
-            error "Failed to add repos: $repos"
-            return 1;
-        }
-        log_change true "$change [$repos]"
-        debug 1 "due to 'M2E_ADD_REPOS', setting dist-upgrade=true"
-        dist_upgrade=true
-    else
-        log_change false "$change"
-    fi
-
-    change="images ppa for cloud-init and maas-enlist (LP: #1511482, 1515733)"
-    if [ "$release" = "precise" ]; then
-        # apt-add-repository failed when trying quantal amd64 with qemu-static.
-        # so instead do this manually.
-        log_change true "$change"
-        debug 1 "configuring PPA at $IMAGES_PPA_URL"
-        echo "deb $IMAGES_PPA_URL $release main" > "$IMAGES_PPA_FILE" ||
-            { error "failed writing to $IMAGES_PPA_FILE"; return 1; }
-        printf "%s\n" "$IMAGES_PPA_APT_KEY" | apt-key add - ||
-            { error "apt-key add failed!"; return 1; }
-        debug 1 "addition of PPA turns dist-upgrade on"
-        dist_upgrade=true
-    else
-        log_change false "$change"
-        debug 1 "not adding images ppa to release=$release"
-    fi
-
-    change="enable proposed"
-    if $proposed; then
-        local mirror=""
-        case "$arch" in
-            i?86|amd64) mirror="${UBUNTU_MIRROR}";;
-            *) mirror="${UBUNTU_MIRROR_PORTS}";;
-        esac
-        log_change true "$change [$arch $mirror]"
-        debug 1 "enabling proposed for $release [$arch $mirror]"
-        echo "deb $mirror ${release}-proposed main universe multiverse" > "$PROPOSED_ARCHIVE_FILE" ||
-            { error "failed writing to $PROPOSED_ARCHIVE_FILE"; return 1; }
-        debug 1 "addition of proposed turns dist-upgrade on"
-        dist_upgrade=true
-    else
-        log_change false "$change"
-        debug 1 "not enabling proposed for $release (proposed=$proposed)."
-    fi
-
-    change="ensure mellanox mlx4_en gets loaded (LP: #1115710)"
-    if [ "$release" = "precise" -a ! -f "/etc/modprobe.d/mlx4.conf" ]; then
-        # packaged version would be mlx4.conf, to avoid conflict
-        # we install a different file here.
-        printf "%s\n%s; %s\n" \
-            "# mlx4_core should load mlx4_en (LP: #1115710)." \
-            "install mlx4_core /sbin/modprobe --ignore-install mlx4_core" \
-            "/sbin/modprobe mlx4_en" \
-            > "/etc/modprobe.d/mlx4.ephemeral.conf"
-        log_change true "$change"
-    else
-        log_change false "$change"
-    fi
-
-    change="build-only: divert newaliases (LP: #1531299)"
-    local newaliases_hack=false
-    if [ "$cross" = "true" ] && [ -f /usr/bin/newaliases ]; then
-        log_change true "$change"
-        # work around LP: #1531299
-        debug 1 "hacking around newaliases in cross root (LP: #1531299)"
-        dpkg-divert --local --rename --add /usr/bin/newaliases
-        ln -s /bin/true /usr/bin/newaliases
-        newaliases_hack=true
-    else
-        log_change false "$change"
-    fi
-
-    local arch_pkgs="" toremove="" removed="" installed=""
-    local add_pkgs="" rel_pkgs="" kernel_pkg=""
-    if [ "$kpkg" != "none" ]; then
-        kernel_pkg="$kpkg"
-    fi
-
-    # additional packages that we have to add
-    add_pkgs="cloud-initramfs-dyn-netconf"  # LP: #1749019
-    add_pkgs="${add_pkgs} open-iscsi overlayroot"
-    if [ -n "${add_packages}" ]; then
-        debug 1 "add_packages=$add_packages (from M2E_ADD_PACKAGES)"
-        add_pkgs="${add_pkgs} ${add_packages}"
-    fi
-
-    # rel_pkgs: packages added only in some releases
-    case "$release" in
-        precise|quantal|raring|saucy|trusty|utopic|vivid)
-            rel_pkgs="${rel_pkgs} maas-enlist";;
-    esac
-
-    change="add u-boot-tools to arch_pkgs for arch '$arch' (LP: #1640519)"
-    if [ "$arch" = "arm64" -o "$arch" = "armhf" ]; then
-        case "$release" in
-            precise|quantal|raring|saucy|trusty|utopic|vivid|wily|\
-            xenial|yakkety)
-                arch_pkgs="${arch_pkgs} u-boot-tools"
-                debug 1 "release '$release' <= yakkety: $change"
-                ;;
-            *) debug 1 "release '$release' > yakkety: do not $change";;
-        esac
-    fi
-
-    local removes="^linux-.*" keeps="^linux-base$" pkglist=""
-    pkglist=$(dpkg-query --show) || { error "failed dpkg-query"; return 1; }
-    toremove=$(echo "$pkglist" |
-            awk '$1 ~ rm && $1 !~ keeps { printf("%s ",$1); }' \
-                "rm=$removes" "keeps=$keeps") &&
-         toremove="${toremove% }"
-    [ $? -eq 0 ] || { error "failed getting list to remove"; return 1; }
-
-    change="removing linux kernel packages."
-    if [ -z "$toremove" ]; then
-        error "nothing to remove: nothing match '$removes' and not '$keeps'."
-        log_change false "$change"
-    else
-        debug 1 "removing: $toremove"
-        ( set -f; _apt remove --purge $toremove ) ||
-            { error "failed to remove $toremove"; return 1; }
-        log_change true "$change [$toremove]"
-    fi
-    removed="$toremove"
-
-    change="apt-get dist-upgrade"
-    if [ "${dist_upgrade}" != "false" ]; then
-        log_change true "$change"
-        _apt dist-upgrade ||
-            { error "failed apt-get dist-upgrade"; return 1; }
-    else
-        log_change false "$change"
-    fi
-
-    local missing="" pkgs="$arch_pkgs $kernel_pkg $add_pkgs $rel_pkgs"
-    missing=$(filter_installed_packages $pkgs)
-    change="install missing packages"
-    if [ -n "$missing" ]; then
-        log_change true "$change [$missing]"
-        _apt install $missing || {
-            error "failed installing $missing";
-            return 1;
-        }
-    else
-        log_change false "$change"
-    fi
-    installed="$missing"
-
-    if ${ppa_clear} && [ -f "$IMAGES_PPA_FILE" ]; then
-        debug 1 "disabling ppa in $IMAGES_PPA_FILE."
-        sed -i "s,^,#," "$IMAGES_PPA_FILE" ||
-            { error "failed to clear $IMAGES_PPA_FILE"; return 1; }
-    fi
-
-    change="remove dpkg foreign architectures"
-    if dpkg --print-foreign-architectures | grep -q i386; then
-        log_change true "$change"
-        # precise used multiarch file
-        dpkg --remove-architecture i386 >/dev/null 2>&1 ||
-            rm /etc/dpkg/dpkg.cfg.d/multiarch
-        dpkg --print-foreign-architectures | grep i386 &&
-            { error "failed to remove i386 foreign arch"; return 1; }
-        debug 1 "removed foreign arch i386"
-    else
-        log_change false "$change"
-    fi
-
-    change="run autoremove"
-    if [ -n "$removed" ]; then
-        log_change true "$change"
-        _apt autoremove ||
-            { error "failed apt-get autoremove"; return 1; }
-    else
-        log_change false "$change"
-    fi
-
-    log_change true "apt-get clean"
-    _apt clean ||
-        { error "failed apt-get clean"; return 1; }
-
-    if [ "$newaliases_hack" = "true" ]; then
-        debug 1 "restoring newaliases"
-        rm -f /usr/bin/newaliases
-        dpkg-divert --local --rename --remove /usr/bin/newaliases
-        ls -l /usr/bin/newaliases
-    fi
-
-    # xenial should not need the symlink, but shipped GA with it
-    # so it is there for now.  Releases pre-xenial do need it.
-    change="symlink ENI for cloud-initramfs-dyn-netconf (LP: #1534205)"
-    local f=/etc/network/interfaces
-    case "$release" in
-        precise|quantal|raring|saucy|trusty|utopic|vivid|wily|xenial)
-            log_change true "$change"
-            mv "$f" "$f.dist" && ln -sf ../../run/network/dynamic-interfaces "$f" ||
-                { error "failed to link dynamic interfaces"; return 1; }
-            ;;
-        *) log_change false "$change";;
-    esac
-
-    ensure_iscsi_initramfs_support "/" "$release" ||
-        { "ensure_iscsi_initramfs_support / $release failed"; return 1; }
-
-    change="create /lib/modules (LP: #1543204)"
-    if [ ! -d "/lib/modules" ]; then
-        log_change true "$change"
-        mkdir /lib/modules ||
-            { error "failed to create /lib/modules"; return 1; }
-    else
-        log_change false "$change"
-    fi
-
-    change="update-initramfs"
-    if [ "$kpkg" != "none" ]; then
-        local k="" i=""
-        for i in /boot/vmlinu?-*; do
-            [ "${i%-virtual}" = "${i}" ] && k=${i};
-        done
-        ver=${k##*/vmlinu?-}
-        log_change true "$change [$ver]"
-        debug 1 "updating kernel version '$ver'"
-        update-initramfs -u -k "$ver" ||
-            { error "update-initramfs failed"; return 1; }
-
-        cp /boot/initrd.img-$ver "$pubd/initrd.img" &&
-            cp /boot/vmlinu?-$ver "$pubd/kernel.img" &&
-            chmod ugo+r "$pubd/kernel.img" ||
-            { error "failed to publish kernel files to $pubd"; return 1; }
-    else
-        log_change false "$change"
-        debug 1 "kernel package = 'none'. No kernels published."
-    fi
-    dpkg-query --show > "$pubd/manifest" ||
-        { error "failed to publish manifest to $pubd"; return 1; }
-
-    return 0
-}
-
-apply_updates() {
-    # apply_updates(dir, kernel_out, initramfs_out)
-    # update directory given, and pull out kernel and initramfs
-    # to given locations
-    short_opts="a:hv"
-    long_opts="arch:,fix-perms-ref:,help,proposed,verbose"
-    getopt_out=$(getopt --name "${0##*/}" \
-        --options "${short_opts}" --long "${long_opts}" -- "$@") &&
-        eval set -- "${getopt_out}" ||
-        { bad_Usage; return 1; }
-    local debian_arch="" perms_ref="" qemu_arch="" proposed=false
-
-    while [ $# -ne 0 ]; do
-        cur=${1}; next=${2};
-        case "$cur" in
-            -a|--arch) debian_arch="$next"; shift;;
-               --fix-perms-ref) perms_ref="$next"; shift;;
-            -h|--help) Usage ; exit 0;;
-               --proposed) proposed=true;;
-            -v|--verbose) VERBOSITY=$((${VERBOSITY}+1));;
-            --) shift; break;;
-        esac
-        shift;
-    done
-
-    [ $# -eq 4 -o $# -eq 5 ] ||
-        { bad_Usage "expected image, kernel, ramdisk [,manifest]"; return 1; }
-    local dir=$1 kpkg=$2 kernel_out=$3 initrd_out=$4 manifest=$5
-    local tab="    "
-
-    disable_services "$dir" || return
-    
-    # we expect /etc/lsb-release to be shell syntax with DISTRIB_CODENAME
-    local rel="" fout host_arch
-    host_arch=$(uname -m)
-    rel=$(. "$dir/etc/lsb-release" && echo "${DISTRIB_CODENAME}") &&
-        [ -n "$rel" ] ||
-        fail "failed to read DISTRIB_CODENAME from $dir/etc/lsb-release"
-
-    if [ -z "$debian_arch" ]; then
-        # not pretty, use 'file' to determine arch
-        fout=$(file -L "$dir/bin/sh") ||
-            { error "'file' on $dir/bin/sh failed"; return 1; }
-        case "$fout" in
-            *\ x86-64,*) debian_arch="amd64";;
-            *\ 80386,*)   debian_arch="i386";;
-            *\ ARM\ aarch64,*) debian_arch="arm64";;
-            *\ ARM,*)   debian_arch="armhf";;
-            *\ 64-bit\ PowerPC*) debian_arch="ppc64el";;
-            *) fail "unknown arch for fileoutput: $fout"; return 1;;
-        esac
-    fi
-
-    case "$debian_arch" in
-        x86_64|amd64) qemu_arch="x86_64";;
-        arm64) qemu_arch="aarch64";;
-        arm*) qemu_arch="arm";;
-        ppc64el) qemu_arch="ppc64le";;
-        powerpc) qemu_arch="ppc";;
-        *) qemu_arch="$debian_arch";;
-    esac
-
-    local cross=true
-    case "$host_arch:$qemu_arch" in
-        $host_arch:$host_arch) cross=false;;
-        ppc64:ppc) cross=false;;
-        i?86:i386) cross=false;;
-        x86_64:i386) cross=false;;
-        aarm64:arm64) cross=false;;
-        arm*:arm*) cross=false;;
-    esac
-
-    debug 1 "arch: $debian_arch rel: $rel host_arch: $host_arch"
-    debug 1 "qemu_arch=$qemu_arch cross=$cross"
-    if $cross; then
-        local fmt="${QEMU_STATIC_FMT:-/usr/bin/qemu-%a-static}" exe=""
-        exe=${fmt//%a/$qemu_arch}
-        cp "$exe" "$dir/usr/bin/qemu-${qemu_arch}-static" || {
-            error "failed to copy qemu-static [$exe] for ${qemu_arch}";
-            error "install qemu-user-static or set QEMU_STATIC_FMT";
-            return 1;
-        }
-        debug 1 "copied $exe into filesystem /usr/bin/qemu-${qemu_arch}-static"
-    else
-        debug 1 "no qemu-static needed to execute $debian_arch on ${host_arch}"
-    fi
-
-    local prox="" apt_opts=""
-    out=$(apt-config shell prox Acquire::HTTP::Proxy) &&
-        eval $out && [ -n "$prox" ] &&
-        apt_opts="--option=Acquire::HTTP::Proxy=${prox}"
-
-    apt_opts="${apt_opts} --option=Dpkg::Options::=--force-confold"
-    [ -n "${apt_opts}" ] &&
-        debug 1 "using apt options ${apt_opts} for install"
-
-    local me=$(readlink -f "$0")
-    local pubd="/tmp/results" fpubd="$dir/tmp/results"
-
-    cross=$cross apt_opts="$apt_opts" kpkg="$kpkg" _VERBOSITY="$VERBOSITY" \
-        proposed=$proposed \
-        pubd="$pubd" \
-        unshare-pidns \
-        chroot "$dir" /bin/bash -s apply_updates_chrooted < "$me" ||
-        { error "failed chroot and kernel install"; return 1; }
-    [ $? -eq 0 ] || {
-        error "failed to install packages or mkinitramfs in chroot";
-        return 1;
-    }
-
-    [ -n "$perms_ref" ] &&
-        chown -R "--reference=$perms_ref" "${fpubd}"
-
-    if [ "$kpkg" != "none" ]; then
-        mv "$fpubd/kernel.img" "$kernel_out" &&
-            mv "$fpubd/initrd.img" "$initrd_out" ||
-            { error "failed to copy kernels out"; return 1; }
-    fi
-
-    # LP: #1034116: disable rescuevol and overlayroot's diskcfg
-    change="disable rescuevol (LP: #1034116)"
-    if grep -q "^cloud-initramfs-rescuevol${tab}" "$fpubd/manifest"; then
-        log_change true "$change"
-        # if cloud-initramfs-resuevol is installed, disable it
-        echo "# cloud-initramfs-rescuevol is disabled by ${0##*/}" \
-            > "$dir/etc/rescuevol-ignore" ||
-        { error "failed to disable rescuevol"; return 1; }
-    else
-        log_change false "$change"
-    fi
-
-    change="disable overlayroot via /etc/overlayroot.local.conf (LP: #1533822)"
-    if grep -q "^overlayroot${tab}" "$fpubd/manifest"; then
-        printf "%s\n%s\n%s\n" "# overlayroot_cfgdisk disabled by ${0##*/}" \
-            "overlayroot_cfgdisk=disabled" "overlayroot=tmpfs" \
-            > "$dir/etc/overlayroot.local.conf"
-    fi
-
-    local pkg_add="" pkg_remove=""
-    pkg_add=$(get_new_pkgs "$fpubd/manifest.in" "$fpubd/manifest") ||
-        fail "failed to get new packages"
-    pkg_remove=$(get_removed_pkgs "$fpubd/manifest.in" "$fpubd/manifest") ||
-        fail "failed to get removed packages"
-    if [ -z "$pkg_add" -a -z "$pkg_remove" ]; then
-        log_change false "package changes: add='' remove=''"
-    else
-        log_change true "package changes: add=$pkg_add remove=$pkg_remove"
-    fi
-
-    if [ -n "$manifest" ]; then
-        mv "$fpubd/manifest" "$manifest" || fail "failed to move manifest"
-    fi
-    rm -Rf "$fpubd" || fail "failed to remove pubd"
-    
-    undisable_services "$dir"
-
-    return 0
-}
-
-if [ "$1" = "apply_updates" ]; then
-    "$@"
-elif [ "$1" = "apply_updates_chrooted" ]; then
-    "$@"
-else
-    short_opts="a:hv"
-    long_opts="arch:,help,proposed,verbose,zero"
-    getopt_out=$(getopt --name "${0##*/}" \
-        --options "${short_opts}" --long "${long_opts}" -- "$@") &&
-        eval set -- "${getopt_out}" ||
-        { bad_Usage; exit 1; }
-    arch=""
-    vargs=""
-    zero=false
-    proposed=""
-
-    while [ $# -ne 0 ]; do
-        cur=${1}; next=${2};
-        case "$cur" in
-            -a|--arch) arch="$next"; shift;;
-            -h|--help) Usage ; exit 0;;
-               --proposed) proposed="--proposed";;
-            -v|--verbose) vargs="${vargs}v";;
-               --zero) zero=true;;
-            --) shift; break;;
-        esac
-        shift;
-    done
-
-    [ $# -eq 4 -o $# -eq 5 ] ||
-        { bad_Usage "expected image, kernel, ramdisk [,manifest]"; exit 1; }
-
-    img="$1"
-    kpkg="$2"
-    kernel="$3"
-    initrd="$4"
-    manifest="$5"
-
-    sudo \
-        m2e_repos="${M2E_ADD_REPOS}" \
-        m2e_add_packages="${M2E_ADD_PACKAGES}" \
-        mount-image-callback --sys --proc --system-resolvconf "$img" -- \
-        "$0" apply_updates ${vargs:+-$vargs} \
-            ${proposed} \
-            "--fix-perms-ref=$img" \
-            ${arch:+"--arch=$arch"} _MOUNTPOINT_ \
-            "$kpkg" "$kernel" "$initrd" ${manifest:+"${manifest}"} ||
-        fail "failed to apply updates to $img"
-
-    if $zero; then
-        # this is optional as it will only work on a raw image
-        e2fsck -fy "$img" || { error "failed to e2fsck $img"; exit 1; }
-        zerofree "$img" || { error "failed zerofree $img"; exit 1; }
-    fi
-
-    exit 0
-
-fi
-# vi: ts=4 expandtab

=== target is u'moved-to-git'
=== modified file 'bin/maas-qcow2targz'
--- bin/maas-qcow2targz	2018-09-18 10:26:54 +0000
+++ bin/maas-qcow2targz	1970-01-01 00:00:00 +0000
@@ -1,235 +0,0 @@
-#!/bin/bash
-#
-# maas-qcowtargz - Take a qcow2 or qcow2.xz file from a given URL or
-#                  file path and make it sufficient for use as a 
-#                  MAAS installable image
-#
-# Copyright (C) 2015-2018 Canonical
-#
-# Authors:
-#    Lee Trager <[e-mail]>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-TEMP_D=""
-command -v unshare-pidns >/dev/null 2>&1 || PATH="${0%/*}:$PATH"
-
-error() { echo "$@" 1>&2; }
-fail() { [ $# -eq 0 ] || error "$@"; exit 1; }
-
-_dl() {
-    local url="$1" out="$2" ret=0
-    local tmp="$out.$$"
-    wget "$url" --progress=dot:mega -O "$tmp" && mv "$tmp" "$out" || {
-        ret=$?
-        error "Failed downloading to $out: $url"
-        rm -f "$tmp"
-    }
-    return $ret
-}
-
-dl() {
-    local url="$1" out="${2:-${1##*/}}"
-    if [ -n "${CACHE_D}" ]; then
-        local cfile="${CACHE_D}/${url##*/}"
-        if [ ! -f "$cfile" ]; then
-            _dl "$url" "$cfile" || return
-        fi
-        [ "$cfile" -ef "$out" ] && return
-        cp "$cfile" "$out"
-        return
-    fi
-
-    _dl "$url" "$out"
-}
-
-cleanup() { [ -d "${TEMP_D}" ] && rm -Rf "${TEMP_D}"; }
-
-function usage() {
-    echo "Usage $0 [options] <URL> <SHA256> <out file>"
-    echo "Options:"
-    echo "  --curtin-path   Path to any curtin files to include in the image."
-    echo "  --packages       Any extra packages to install into the image."
-
-}
-
-short_opts="c:p:h"
-long_opts="curtin-path:,packages:,help"
-
-getopt_out=$(getopt --name "${##*/}" --options "${short_opts}" --long "${long_opts}" -- "$@")
-if [ $? -ne 0 ]; then
-    usage
-    exit 1
-fi
-
-eval set -- "$getopt_out"
-while true; do
-    case "$1" in
-        -c|--curtin-path)
-            curtin_path=$2
-            shift 2
-            ;;
-        -p|--packages)
-            packages=$2
-            shift 2
-            ;;
-        -h|--help)
-            usage
-            exit 0
-            ;;
-        --)
-            shift
-            break
-            ;;
-    esac
-done
-
-if [ "$1" == "maasify" ]; then
-    [ "$(id -u)" = "0" ] || { error "not root, sorry"; exit 1; }
-    root_d=$2
-    out=$3
-    if [ -n "$curtin_path" ]; then
-        mkdir -p "$root_d/curtin" ||
-            { error "failed to create /curtin"; return 1; }
-        cp -r "$curtin_path/"* "$root_d/curtin/" || {
-            error "failed copying $CURTIN_PATH to $root_d/curtin";
-            return 1;
-        }
-        chmod +x "$root_d/curtin/"* ||
-            { error "failed chmod +x $root_d/curtin/*"; return 1; }
-    fi
-
-    if [ -n "$packages" ]; then
-        # We need working DNS to pull packages from the repo
-        cp /etc/resolv.conf "${root_d}/etc/resolv.conf"
-        for package in $(echo $packages | sed 's/,/ /g'); do
-            LANG=C unshare-pidns chroot "$root_d" yum -y install $package || {
-                error "failed to install $package"
-                exit 1
-            }
-        done
-        # Don't ship with yum cache
-        LANG=C unshare-pidns chroot "$root_d" yum clean all || {
-                error "failed to clear yum cache"
-                exit 1
-            }
-	# Upstream ships with DNS information in /etc/resolv.conf, ship a
-	# clean version.
-	rm "${root_d}/etc/resolv.conf"
-	touch "${root_d}/etc/resolv.conf"
-	chown root:root "${root_d}/etc/resolv.conf"
-	chmod 644 "${root_d}/etc/resolv.conf"
-    fi
-
-    error "Taring up image contents... into $out"
-    gzflag="--use-compress-program=gzip"
-    if command -v pigz >/dev/null 2>&1; then
-        gzflag="--use-compress-program=pigz"
-    fi
-    tar --directory "$root_d" --create --preserve-permissions \
-        --one-file-system \
-        --sparse --file "$out" $gzflag \
-        --xattrs "--xattrs-include=*" . || {
-        error "failed tar command"
-        rm -f "$out"
-        exit 1
-    }
-else
-    if [ $# -ne 3 ]; then
-        usage
-        exit 1
-    fi
-    url=$1
-    sha256=$2
-    if [ "$(dirname $3)" == "." ]; then
-        out="${PWD}/${3}"
-    else
-        out=$3
-    fi
-
-    error "final output will be in ${out}"
-
-    mkdir -p $(dirname "$out")
-
-    cache_d="${CACHE_D:-$PWD/cache}"
-    [ -d "$cache_d" ] || mkdir -p "$cache_d" || fail "failed mkdir $cache_d"
-
-    TEMP_D=$(mktemp -d "${TMPDIR:-/tmp}/${0##*/}.XXXXXX")
-    trap cleanup EXIT
-
-    if [ -f "$url" ]; then
-        img_path="$url"
-    else
-        img_path="${cache_d}/${url##*/}"
-        if [ ! -f "${img_path}" ]; then
-            dl "$url" "$img_path" ||
-                fail "failed download $url"
-        else
-            error "using cached '${url##*/}' in ${cache_d}"
-        fi
-
-        # We were given a SHA512 instead of a SHA256
-        if [ ${#sha256} -eq 128 ]; then
-            error "Checking sha512sum for $img_path"
-            sha512_out=$(sha512sum "$img_path") ||
-                fail "failed: sha512sum $img_path"
-            sha512_out=${sha512_out%  *}
-            if [ "$sha512_out" != "$sha256" ]; then
-                fail "Error: unexpected sha512 of $img_path $sha512_out != $sha256"
-            fi
-        else
-            error "Checking sha256sum for $img_path"
-            sha256_out=$(sha256sum "$img_path") ||
-                fail "failed: sha256sum $img_path"
-            sha256_out=${sha256_out%  *}
-            if [ "$sha256_out" != "$sha256" ]; then
-                fail "Error: unexpected sha256 of $img_path $sha256_out != $sha256"
-            fi
-        fi
-
-        fout=$(LANG=C file "$img_path") ||
-            fail "failed file $img_path"
-        case "${fout#$img_path: }" in
-            "XZ compressed data"*)
-                new_img_path="${img_path%.xz}"
-                if [ -f "$new_img_path" ]; then
-                    error "using cached uncompressed '$new_img_path'"
-                else
-                    error "Decompressing XZ image..."
-                    xzcat "$img_path" > "${new_img_path}" ||
-                        { rm -f "$new_img_path"; fail "failed xzcat"; }
-                fi
-                img_path="${new_img_path}"
-                ;;
-        esac
-    fi
-    working_img="${TEMP_D}/${img_path##*/}"
-
-    error "copying $img_path to $working_img"
-    cp "$img_path" "$working_img" ||
-        fail "failed copying image ${img_path} -> ${working_img}"
-
-    cb_args="maasify _MOUNTPOINT_ $out"
-    [ -n "$curtin_path" ] && cb_args="$cb_args --curtin-path $curtin_path"
-    [ -n "$packages" ] && cb_args="$cb_args --packages $packages"
-    sudo \
-        CACHE_D="${cache_d}" \
-        ${http_proxy:+"http_proxy=${http_proxy}"} \
-        ${https_proxy:+"https_proxy=${https_proxy}"} \
-        mount-image-callback --proc --dev "$working_img" -- \
-        "$0" $cb_args
-
-    error "wrote $out"
-fi
-
-# vi: ts=4 expandtab

=== target is u'moved-to-git'
=== modified file 'bin/meph2-build'
--- bin/meph2-build	2016-01-12 21:50:59 +0000
+++ bin/meph2-build	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import sys
-
-
-def call_entry_point(name):
-    (istr, dot, ent) = name.rpartition('.')
-    try:
-        __import__(istr)
-    except ImportError:
-        # if that import failed, check dirname(__file__/..)
-        # to support ./bin/program with modules in .
-        _tdir = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
-        sys.path.insert(0, _tdir)
-        try:
-            __import__(istr)
-        except ImportError as e:
-            sys.stderr.write("Unable to find %s: %s\n" % (name, e))
-            sys.exit(2)
-
-    sys.exit(getattr(sys.modules[istr], ent)())
-
-if __name__ == '__main__':
-    call_entry_point("meph2.commands.build_image.main")
-
-# vi: ts=4 expandtab syntax=python
-

=== target is u'moved-to-git'
=== modified file 'bin/meph2-cloudimg-sync'
--- bin/meph2-cloudimg-sync	2015-09-11 19:10:40 +0000
+++ bin/meph2-cloudimg-sync	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import sys
-
-
-def call_entry_point(name):
-    (istr, dot, ent) = name.rpartition('.')
-    try:
-        __import__(istr)
-    except ImportError:
-        # if that import failed, check dirname(__file__/..)
-        # to support ./bin/program with modules in .
-        _tdir = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
-        sys.path.insert(0, _tdir)
-        try:
-            __import__(istr)
-        except ImportError as e:
-            sys.stderr.write("Unable to find %s: %s\n" % (name, e))
-            sys.exit(2)
-
-    sys.exit(getattr(sys.modules[istr], ent)())
-
-if __name__ == '__main__':
-    call_entry_point("meph2.commands.cloudimg_sync.main")
-
-# vi: ts=4 expandtab syntax=python

=== target is u'moved-to-git'
=== modified file 'bin/meph2-import'
--- bin/meph2-import	2016-09-26 19:23:50 +0000
+++ bin/meph2-import	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import sys
-
-
-def call_entry_point(name):
-    (istr, dot, ent) = name.rpartition('.')
-    try:
-        __import__(istr)
-    except ImportError:
-        # if that import failed, check dirname(__file__/..)
-        # to support ./bin/program with modules in .
-        _tdir = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
-        sys.path.insert(0, _tdir)
-        try:
-            __import__(istr)
-        except ImportError as e:
-            sys.stderr.write("Unable to find %s: %s\n" % (name, e))
-            sys.exit(2)
-
-    sys.exit(getattr(sys.modules[istr], ent)())
-
-if __name__ == '__main__':
-    call_entry_point("meph2.commands.mimport.main")
-
-# vi: ts=4 expandtab syntax=python

=== target is u'moved-to-git'
=== modified file 'bin/meph2-util'
--- bin/meph2-util	2015-09-11 19:10:40 +0000
+++ bin/meph2-util	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import sys
-
-
-def call_entry_point(name):
-    (istr, dot, ent) = name.rpartition('.')
-    try:
-        __import__(istr)
-    except ImportError:
-        # if that import failed, check dirname(__file__/..)
-        # to support ./bin/program with modules in .
-        _tdir = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
-        sys.path.insert(0, _tdir)
-        try:
-            __import__(istr)
-        except ImportError as e:
-            sys.stderr.write("Unable to find %s: %s\n" % (name, e))
-            sys.exit(2)
-
-    sys.exit(getattr(sys.modules[istr], ent)())
-
-if __name__ == '__main__':
-    call_entry_point("meph2.commands.meph2_util.main")
-
-# vi: ts=4 expandtab syntax=python

=== target is u'moved-to-git'
=== added file 'bin/moved-to-git'
--- bin/moved-to-git	1970-01-01 00:00:00 +0000
+++ bin/moved-to-git	2018-09-21 12:24:04 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+me=$(readlink -f "$0")
+mydir=${me%/*}
+readme="$mydir/../README"
+[ -f "$readme" ] || {
+    echo "ERROR: maas-images moved to git." 1>&2
+    exit 1
+}
+cat "$readme" 1>&2
+exit 1

=== modified file 'bin/netboot-mirror'
--- bin/netboot-mirror	2015-09-11 19:10:40 +0000
+++ bin/netboot-mirror	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import sys
-
-
-def call_entry_point(name):
-    (istr, dot, ent) = name.rpartition('.')
-    try:
-        __import__(istr)
-    except ImportError:
-        # if that import failed, check dirname(__file__/..)
-        # to support ./bin/program with modules in .
-        _tdir = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
-        sys.path.insert(0, _tdir)
-        try:
-            __import__(istr)
-        except ImportError as e:
-            sys.stderr.write("Unable to find %s: %s\n" % (name, e))
-            sys.exit(2)
-
-    sys.exit(getattr(sys.modules[istr], ent)())
-
-if __name__ == '__main__':
-    call_entry_point("meph2.commands.netboot_mirror.main")
-
-# vi: ts=4 expandtab syntax=python

=== target is u'moved-to-git'
=== modified file 'bin/unshare-pidns'
--- bin/unshare-pidns	2017-05-03 11:27:18 +0000
+++ bin/unshare-pidns	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-#!/bin/sh
-has_unshare_pid() {
-    command -v unshare >/dev/null 2>&1 || return 1
-    local helpout=""
-    helpout=$(unshare --help) || return 1
-    case "$helpout" in
-        *--fork*--pid*|*--pid*--fork*) :;;
-        *) return 1;;
-    esac
-    return 0
-}
-if has_unshare_pid; then
-    exec unshare --fork --pid -- "$@"
-else
-    rval=${M2E_REQUIRE_UNSHARE:-0}
-    case "$rval" in
-        0) :;;
-        *) echo "unshare pid not available (M2E_REQUIRE_UNSHARE=$rval)." 1>&2;
-           exit 3;;
-    esac
-    exec "$@"
-fi
-
-# vi: ts=4 expandtab

=== target is u'moved-to-git'
=== removed directory 'conf'
=== removed file 'conf/bootloaders.yaml'
--- conf/bootloaders.yaml	2018-08-07 21:31:31 +0000
+++ conf/bootloaders.yaml	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-product_id: "com.ubuntu.maas.daily:1:{os}:{firmware_platform}:{arch}"
-content_id: "com.ubuntu.maas:daily:1:bootloader-download"
-
-bootloaders:
- - firmware-platform: pxe
-   packages:
-    - pxelinux
-    - syslinux-common
-   arch: i386
-   arches: i386,amd64
-   archive: http://archive.ubuntu.com/ubuntu
-   release: bionic
-   os: pxelinux
-   files:
-    - usr/lib/PXELINUX/pxelinux.0
-    - usr/lib/PXELINUX/lpxelinux.0
-    - usr/lib/syslinux/modules/bios/*.c32
- - firmware-platform: uefi
-   packages:
-    - shim-signed
-    - grub-efi-amd64-signed
-   arch: amd64
-   arches: amd64
-   archive: http://archive.ubuntu.com/ubuntu
-   release: bionic
-   os: grub-efi-signed
-   files:
-    - usr/lib/shim/shimx64.efi.signed, bootx64.efi
-    - usr/lib/grub/x86_64-efi-signed/grubnetx64.efi.signed, grubx64.efi
- - firmware-platform: uefi
-   packages:
-    - grub-efi-arm64-bin
-   arch: arm64
-   arches: arm64
-   archive: http://ports.ubuntu.com
-   release: bionic
-   os: grub-efi
-   files:
-    - usr/lib/grub/arm64-efi/
-   grub_format: arm64-efi
-   grub_output: grubaa64.efi
-   grub_config: |
-      # MAAS GRUB2 pre-loader configuration file
-      
-      # Load based on MAC address first.
-      configfile (pxe)/grub/grub.cfg-${net_default_mac}
-
-      # Failed to load based on MAC address.
-      # Load arm64 by default, UEFI only supported by 64-bit
-      configfile (pxe)/grub/grub.cfg-default-arm64
- - firmware-platform: open-firmware
-   packages:
-    - grub-ieee1275-bin
-   arch: ppc64el
-   arches: ppc64el,ppc64
-   archive: http://ports.ubuntu.com
-   release: xenial
-   os: grub-ieee1275
-   files:
-    - usr/lib/grub/powerpc-ieee1275/
-   grub_format: powerpc-ieee1275
-   grub_output: bootppc64.bin
-   grub_config: |
-      configfile (pxe)/grub/grub.cfg-${net_default_mac}
-      configfile (pxe)/grub/grub.cfg-default-ppc64el
-
-# vi: syntax=yaml nowrap

=== removed file 'conf/centos.yaml'
--- conf/centos.yaml	2018-09-18 13:38:31 +0000
+++ conf/centos.yaml	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-image_index: http://cloud.centos.org/centos/{version}/images/image-index
-
-product_id: "com.ubuntu.maas.daily:centos-bases:{version}:{arch}"
-content_id: "com.ubuntu.maas:daily:centos-bases-download"
-os: centos
-arch: amd64
-
-versions:
-    centos70:
-        version: 7.0
-        path_version: 7
-        release_title: "CentOS 7.0"
-        curtin_files: "{curtin_path}/centos7"
-        # The upstream revision to create MAAS images for. All other versions
-        # are ignored if this is defined.
-        revision: 1808
-        # The lp:maas-images release. This defaults to 01. Changing this will
-        # cause a new build of the revision to be imported.
-        release: 02
-        packages:
-         # cloud-init depends on packages from EPEL
-         - epel-release
-         - bash-completion
-         - linux-firmware
-         # XXX ltrager 2017-07-28 - COPR doesn't provide a URL to the latest
-         # package build. Instead it expects you to first add the repo which
-         # is what is included in this package.
-         - https://copr-be.cloud.fedoraproject.org/results/%40cloud-init/el-stable/epel-7-x86_64/00581936-cloud-init-el-release/cloud-init-el-release-7-1.noarch.rpm
-         # The image most likely already has cloud-init, this pulls Canonical's
-         # version
-         - cloud-init
-         # bridge-utils is required by cloud-init to configure networking.
-         # Without it cloud-init will try to install it which will not work in
-         # isolated environments.
-         - bridge-utils
-         # Tools needed to allow custom storage to be deployed without
-         # accessing the Internet.
-         # grub2-efi-x64 contains the signed bootloader which currently does not
-         # chainboot - RHBZ #1623296
-         # - grub2-efi-x64
-         # - shim-x64
-         # RHBZ #1101352
-         - grub2-efi-x64-modules
-         - grub2-tools
-         - efibootmgr
-         - dosfstools
-         - lvm2
-         - mdadm
-         - device-mapper-multipath
-         - iscsi-initiator-utils
-    centos66:
-        version: 6.6
-        release_title: "CentOS 6.6"
-        curtin_files: "{curtin_path}/centos6"
-        # The upstream revision to create MAAS images for. All other versions
-        # are ignored if this is defined.
-        revision: 1808
-        # The lp:maas-images release. This defaults to 01. Changing this will
-        # cause a new build of the revision to be imported.
-        release: 02
-        packages:
-         # cloud-init depends on packages from EPEL
-         - epel-release
-         - bash-completion
-         # XXX ltrager 2017-07-28 - COPR doesn't provide a URL to the latest
-         # package build. Instead it expects you to first add the repo which
-         # is what is included in this package.
-         - https://copr-be.cloud.fedoraproject.org/results/%40cloud-init/el-stable/epel-6-x86_64/00581936-cloud-init-el-release/cloud-init-el-release-7-1.noarch.rpm
-         # The image most likely already has cloud-init, this pulls Canonical's
-         # version
-         - cloud-init
-         # bridge-utils is required by cloud-init to configure networking.
-         # Without it cloud-init will try to install it which will not work in
-         # isolated environments.
-         - bridge-utils
-         # Tools needed to allow custom storage to be deployed without
-         # accessing the Internet.
-         - efibootmgr
-         - btrfs-progs
-         - dosfstools
-         - lvm2
-         - mdadm
-         - xfsprogs
-         - device-mapper-multipath
-         - iscsi-initiator-utils
-
-# vi: syntax=yaml nowrap

=== removed file 'conf/meph-v2.yaml'
--- conf/meph-v2.yaml	2018-05-07 14:03:39 +0000
+++ conf/meph-v2.yaml	1970-01-01 00:00:00 +0000
@@ -1,226 +0,0 @@
-# kernel entries are a list of
-#   kernel-release, arch, primary-subarch, flavor, kernel-pkgname, subarches
-# we use the anchors to make subarches more compact
-#
-# builtin_kernel is "builtin" kernel.
-# default is 'linux-generic'
-#
-# kernel arrays are
-#   krel, karch, primary-subarch, flavor, kernel-package, [subarches], {khdata}
-#
-# 'khdata' is an optional dictionary used to tell which dtb files to pull or
-# what kernel helper to run on the kernel and initramfs.
-
-subarches:
- - &sa_hwe_p  [generic, hwe-p]
- - &sa_hwe_q  [generic, hwe-p, hwe-q]
- - &sa_hwe_r  [generic, hwe-p, hwe-q, hwe-r]
- - &sa_hwe_s  [generic, hwe-p, hwe-q, hwe-r, hwe-s]
- - &sa_hwe_t  [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
- - &sa_hwe_u  [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
- - &sa_hwe_v  [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
- - &sa_hwe_w  [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w]
- - &sa_hwe_x  [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x]
- - &sa_hwe_y  [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y]
- - &sa_hwe_z  [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z]
- - &sa_hwe_a  [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z, hwe-a]
- - &sa_hwe_b  [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z, hwe-a, hwe-b]
- - &sa_hwe_c  [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z, hwe-a, hwe-b, hwe-c]
- - &arm_hwe_t [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
- - &arm_hwe_u [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
- - &arm_hwe_v [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
- - &arm_hwe_w [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w]
- - &arm_hwe_x [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x]
- - &arm_hwe_y [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y]
- - &arm_hwe_z [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z]
- - &arm_hwe_a [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z, hwe-a]
- - &arm_hwe_b [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z, hwe-a, hwe-b]
- - &arm_hwe_c [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z, hwe-a, hwe-b, hwe-c]
-
-misc:
- - &glpae generic-lpae
- - &xguboot xgene-uboot
- - &mustang xgene-uboot-mustang
- - &kh-mustang {suffix: .xgene-mustang, kihelper: kh-xgene,
-               di-format: 'xgene', dtb: 'apm-mustang.dtb'}
- - &kh-xgene   {suffix: .xgene, kihelper: "kh-xgene", di-format: 'xgene'}
-
-releases:
- - version: "18.10"
-   release: cosmic
-   kernels:
-    - [cosmic,  amd64,   hwe-c,    generic,   linux-signed-generic,     *sa_hwe_c]
-    - [cosmic,  arm64,   hwe-c,    generic,   linux-generic,            *sa_hwe_c]
-    - [cosmic,  arm64,   *mustang, generic,   linux-generic,            [*mustang], *kh-mustang]
-    - [cosmic,  arm64,   *xguboot, generic,   linux-generic,            [*xguboot], *kh-xgene]
-    - [cosmic,  armhf,   *glpae,   *glpae,    linux-generic-lpae,       [*glpae]]
-    - [cosmic,  armhf,   hwe-c,    generic,   linux-generic,            *arm_hwe_c]
-    - [cosmic,  i386,    hwe-c,    generic,   linux-generic,            *sa_hwe_c]
-    - [cosmic,  ppc64el, hwe-c,    generic,   linux-generic,            *sa_hwe_c]
-    - [cosmic,  s390x,   hwe-c,    generic,   linux-generic,            *sa_hwe_c]
- - version: "18.04"
-   release: bionic
-   kernels:
-    - [bionic,  amd64,   hwe-b,    generic,   linux-signed-generic,     *sa_hwe_b]
-    - [bionic,  arm64,   hwe-b,    generic,   linux-generic,            *sa_hwe_b]
-    - [bionic,  arm64,   *mustang, generic,   linux-generic,            [*mustang], *kh-mustang]
-    - [bionic,  arm64,   *xguboot, generic,   linux-generic,            [*xguboot], *kh-xgene]
-    - [bionic,  armhf,   *glpae,   *glpae,    linux-generic-lpae,       [*glpae]]
-    - [bionic,  armhf,   hwe-b,    generic,   linux-generic,            *arm_hwe_b]
-    - [bionic,  i386,    hwe-b,    generic,   linux-generic,            *sa_hwe_b]
-    - [bionic,  ppc64el, hwe-b,    generic,   linux-generic,            *sa_hwe_b]
-    - [bionic,  s390x,   hwe-b,    generic,   linux-generic,            *sa_hwe_b]
- - version: "17.10"
-   release: artful
-   kernels:
-    - [artful,  amd64,   hwe-a,    generic,   linux-signed-generic,     *sa_hwe_a]
-    - [artful,  arm64,   hwe-a,    generic,   linux-generic,            *sa_hwe_a]
-    - [artful,  arm64,   *mustang, generic,   linux-generic,            [*mustang], *kh-mustang]
-    - [artful,  arm64,   *xguboot, generic,   linux-generic,            [*xguboot], *kh-xgene]
-    - [artful,  armhf,   *glpae,   *glpae,    linux-generic-lpae,       [*glpae]]
-    - [artful,  armhf,   hwe-a,    generic,   linux-generic,            *arm_hwe_a]
-    - [artful,  i386,    hwe-a,    generic,   linux-generic,            *sa_hwe_a]
-    - [artful,  ppc64el, hwe-a,    generic,   linux-generic,            *sa_hwe_a]
-    - [artful,  s390x,   hwe-a,    generic,   linux-generic,            *sa_hwe_a]
- - version: "17.04"
-   release: zesty
-   kernels:
-    - [zesty,  amd64,   hwe-z,    generic,   linux-signed-generic,     *sa_hwe_z]
-    - [zesty,  arm64,   hwe-z,    generic,   linux-generic,            *sa_hwe_z]
-    - [zesty,  arm64,   *mustang, generic,   linux-generic,            [*mustang], *kh-mustang]
-    - [zesty,  arm64,   *xguboot, generic,   linux-generic,            [*xguboot], *kh-xgene]
-    - [zesty,  armhf,   *glpae,   *glpae,    linux-generic-lpae,       [*glpae]]
-    - [zesty,  armhf,   hwe-z,    generic,   linux-generic,            *arm_hwe_z]
-    - [zesty,  i386,    hwe-z,    generic,   linux-generic,            *sa_hwe_z]
-    - [zesty,  ppc64el, hwe-z,    generic,   linux-generic,            *sa_hwe_z]
-    - [zesty,  s390x,   hwe-z,    generic,   linux-generic,            *sa_hwe_z]
- - version: "16.10"
-   release: yakkety
-   kernels:
-    - [yakkety,  amd64,   hwe-y,    generic,   linux-signed-generic,     *sa_hwe_y]
-    - [yakkety,  arm64,   hwe-y,    generic,   linux-generic,            *sa_hwe_y]
-    - [yakkety,  arm64,   *mustang, generic,   linux-generic,            [*mustang], *kh-mustang]
-    - [yakkety,  arm64,   *xguboot, generic,   linux-generic,            [*xguboot], *kh-xgene]
-    - [yakkety,  armhf,   *glpae,   *glpae,    linux-generic-lpae,       [*glpae]]
-    - [yakkety,  armhf,   hwe-y,    generic,   linux-generic,            *arm_hwe_y]
-    - [yakkety,  i386,    hwe-y,    generic,   linux-generic,            *sa_hwe_y]
-    - [yakkety,  ppc64el, hwe-y,    generic,   linux-generic,            *sa_hwe_y]
-    - [yakkety,  s390x,   hwe-y,    generic,   linux-generic,            *sa_hwe_y]
- - version: "16.04"
-   release: xenial
-   kernels:
-    - [xenial,  amd64,   hwe-x,    generic,   linux-signed-generic,     *sa_hwe_x]
-    - [xenial,  arm64,   hwe-x,    generic,   linux-generic,            *sa_hwe_x]
-    - [xenial,  arm64,   *mustang, generic,   linux-generic,            [*mustang], *kh-mustang]
-    - [xenial,  arm64,   *xguboot, generic,   linux-generic,            [*xguboot], *kh-xgene]
-    - [xenial,  armhf,   *glpae,   *glpae,    linux-generic-lpae,       [*glpae]]
-    - [xenial,  armhf,   hwe-x,    generic,   linux-generic,            *arm_hwe_x]
-    - [xenial,  i386,    hwe-x,    generic,   linux-generic,            *sa_hwe_x]
-    - [xenial,  ppc64el, hwe-x,    generic,   linux-generic,            *sa_hwe_x]
-    - [xenial,  s390x,   hwe-x,    generic,   linux-generic,            *sa_hwe_x]
- - version: "15.10"
-   builtin_kernel: linux-generic
-   release: wily
-   kernels:
-    - [wily,    armhf,   hwe-w,    generic,   linux-generic,            *arm_hwe_w]
-    - [wily,    armhf,   *glpae,   *glpae,    linux-generic-lpae,       [*glpae]]
-    - [wily,    i386,    hwe-w,    generic,   linux-generic,            *sa_hwe_w]
-    - [wily,    amd64,   hwe-w,    generic,   linux-signed-generic,     *sa_hwe_w]
-    - [wily,    ppc64el, hwe-w,    generic,   linux-generic,            *sa_hwe_w]
-    - [wily,    arm64,   hwe-w,    generic,   linux-generic,            *sa_hwe_w]
-    - [wily,    arm64,   *xguboot, generic,   linux-generic,            [*xguboot], *kh-xgene]
-    - [wily,    arm64,   *mustang, generic,   linux-generic,            [*mustang], *kh-mustang]
- - version: "15.04"
-   release: vivid
-   builtin_kernel: linux-generic
-   kernels:
-    - [vivid,   armhf,   hwe-v,    generic,   linux-generic,            *arm_hwe_v]
-    - [vivid,   armhf,   *glpae,   *glpae,    linux-generic-lpae,       [*glpae]]
-    - [vivid,   i386,    hwe-v,    generic,   linux-generic,            *sa_hwe_v]
-    - [vivid,   amd64,   hwe-v,    generic,   linux-signed-generic,     *sa_hwe_v]
-    - [vivid,   ppc64el, hwe-v,    generic,   linux-generic,            *sa_hwe_v]
-    - [vivid,   arm64,   hwe-v,    generic,   linux-generic,            *sa_hwe_v]
-    - [vivid,   arm64,   *xguboot, generic,   linux-generic,            [*xguboot], *kh-xgene]
-    - [vivid,   arm64,   *mustang, generic,   linux-generic,            [*mustang], *kh-mustang]
- - version: "14.10"
-   builtin_kernel: linux-generic
-   release: utopic
-   kernels:
-    - [utopic,  armhf,   hwe-u,    generic,   linux-generic,            *arm_hwe_u]
-    - [utopic,  armhf,   *glpae,   *glpae,    linux-generic-lpae,       [*glpae]]
-    - [utopic,  i386,    hwe-u,    generic,   linux-generic,            *sa_hwe_u]
-    - [utopic,  amd64,   hwe-u,    generic,   linux-signed-generic,     *sa_hwe_u]
-    - [utopic,  ppc64el, hwe-u,    generic,   linux-generic,            *sa_hwe_u]
-    - [utopic,  arm64,   hwe-u,    generic,   linux-generic,            *sa_hwe_u]
-    - [utopic,  arm64,   *xguboot, generic,   linux-generic,            [*xguboot], *kh-xgene]
-    - [utopic,  arm64,   *mustang, generic,   linux-generic,            [*mustang], *kh-mustang]
- - version: "14.04"
-   builtin_kernel: linux-generic
-   release: trusty
-   kernels:
-    - [trusty,  armhf,   hwe-t,    generic,   linux-generic,            *arm_hwe_t]
-    - [trusty,  armhf,   *glpae,   *glpae,    linux-generic-lpae,       [*glpae]]
-    - [trusty,  i386,    hwe-t,    generic,   linux-generic,            *sa_hwe_t]
-    - [trusty,  amd64,   hwe-t,    generic,   linux-signed-generic,     *sa_hwe_t]
-    - [trusty,  ppc64el, hwe-t,    generic,   linux-generic,            *sa_hwe_t]
-    - [trusty,  arm64,   hwe-t,    generic,   linux-generic,            *sa_hwe_t]
-    - [trusty,  arm64,   *xguboot, generic,   linux-generic,            [*xguboot], *kh-xgene]
-    - [trusty,  arm64,   *mustang, generic,   linux-generic,            [*mustang], *kh-mustang]
-    - [utopic,  amd64,   hwe-u,    generic,  linux-signed-generic-lts-utopic,  *sa_hwe_u]
-    - [utopic,  arm64,   hwe-u,    generic,  linux-generic-lts-utopic,  *sa_hwe_u]
-    - [utopic,  armhf,   hwe-u,    generic,  linux-generic-lts-utopic,  *sa_hwe_u]
-    - [utopic,  i386,    hwe-u,    generic,  linux-generic-lts-utopic,  *sa_hwe_u]
-    - [utopic,  ppc64el, hwe-u,    generic,  linux-generic-lts-utopic,  *sa_hwe_u]
-    - [vivid,   amd64,   hwe-v,    generic,  linux-signed-generic-lts-vivid,   *sa_hwe_v]
-    - [vivid,   arm64,   hwe-v,    generic,  linux-generic-lts-vivid,   *sa_hwe_v]
-    - [vivid,   armhf,   hwe-v,    generic,  linux-generic-lts-vivid,   *sa_hwe_v]
-    - [vivid,   i386,    hwe-v,    generic,  linux-generic-lts-vivid,   *sa_hwe_v]
-    - [vivid,   ppc64el, hwe-v,    generic,  linux-generic-lts-vivid,   *sa_hwe_v]
-    - [wily,    amd64,   hwe-w,    generic,  linux-signed-generic-lts-wily,    *sa_hwe_w]
-    - [wily,    arm64,   hwe-w,    generic,  linux-generic-lts-wily,    *sa_hwe_w]
-    - [wily,    armhf,   hwe-w,    generic,  linux-generic-lts-wily,    *sa_hwe_w]
-    - [wily,    i386,    hwe-w,    generic,  linux-generic-lts-wily,    *sa_hwe_w]
-    - [wily,    ppc64el, hwe-w,    generic,  linux-generic-lts-wily,    *sa_hwe_w]
-    - [xenial,  amd64,   hwe-x,    generic,  linux-signed-generic-lts-xenial,  *sa_hwe_x]
-    - [xenial,  arm64,   hwe-x,    generic,  linux-generic-lts-xenial,  *sa_hwe_x]
-    - [xenial,  armhf,   hwe-x,    generic,  linux-generic-lts-xenial,  *sa_hwe_x]
-    - [xenial,  i386,    hwe-x,    generic,  linux-generic-lts-xenial,  *sa_hwe_x]
-    - [xenial,  ppc64el, hwe-x,    generic,  linux-generic-lts-xenial,  *sa_hwe_x]
- - version: "13.10"
-   builtin_kernel: linux-generic
-   release: saucy
-   kernels:
-    - [saucy,   armhf,   hwe-s,    generic,   linux-generic,            *sa_hwe_s]
-    - [saucy,   armhf,   *glpae,   *glpae,    linux-generic-lpae,       [*glpae]]
-    - [saucy,   i386,    hwe-s,    generic,   linux-generic,            *sa_hwe_t]
-    - [saucy,   amd64,   hwe-s,    generic,   linux-signed-generic,     *sa_hwe_t]
- - version: "12.04"
-   release: precise
-   builtin_kernel: {armhf: linux-highbank, default: 'linux-generic'}
-   kernels:
-    - [precise, i386,    hwe-p,    generic,  linux-generic,             *sa_hwe_p]
-    - [precise, amd64,   hwe-p,    generic,  linux-signed-generic,      *sa_hwe_p]
-    - [precise, armhf,   highbank, highbank, linux-highbank,            [highbank]]
-    - [quantal, i386,    hwe-q,    generic,  linux-generic-lts-quantal, *sa_hwe_q]
-    - [quantal, amd64,   hwe-q,    generic,  linux-signed-generic-lts-quantal, *sa_hwe_q]
-    - [raring,  i386,    hwe-r,    generic,  linux-generic-lts-raring,  *sa_hwe_r]
-    - [raring,  amd64,   hwe-r,    generic,  linux-signed-generic-lts-raring,  *sa_hwe_r]
-    - [saucy,   i386,    hwe-s,    generic,  linux-generic-lts-saucy,   *sa_hwe_s]
-    - [saucy,   amd64,   hwe-s,    generic,  linux-signed-generic-lts-saucy,   *sa_hwe_s]
-    - [trusty,  i386,    hwe-t,    generic,  linux-generic-lts-trusty,  *sa_hwe_t]
-    - [trusty,  amd64,   hwe-t,    generic,  linux-signed-generic-lts-trusty,  *sa_hwe_t]
-
-# enable_proposed: True
-
-## Notes:
-##  * there are no hwe installer kernels for armhf
-##    nothing named 'saucy-highbank' at
-##     http://ports.ubuntu.com/ubuntu-ports/dists/precise-updates/main/installer-armhf/current/images/MD5SUMS
-##    so for now, we just don't have a stream for that.
-##  * kernel meta package in all cases here is linux-image-<flavor>
-
-default_target: http://images.maas.io/ephemeral-v2/daily/streams/v1/com.ubuntu.maas:daily:v2:download.json
-content_id: com.ubuntu.maas:daily:v2:download
-product_id_pre: com.ubuntu.maas.daily:v2:boot
-
-# vi: syntax=yaml nowrap

=== removed file 'conf/meph-v3.yaml'
--- conf/meph-v3.yaml	2018-05-04 17:21:27 +0000
+++ conf/meph-v3.yaml	1970-01-01 00:00:00 +0000
@@ -1,228 +0,0 @@
-# kernel entries are a list of
-#   kernel-release, arch, primary-subarch, flavor, kernel-pkgname, subarches
-# we use the anchors to make subarches more compact
-#
-# builtin_kernel is "builtin" kernel.
-# default is 'linux-generic'
-#
-# kernel arrays are
-#   krel, karch, primary-subarch, flavor, kernel-package, [subarches], {khdata}
-#
-# 'khdata' is an optional dictionary used to tell which dtb files to pull or
-# what kernel helper to run on the kernel and initramfs.
-
-# Previous to 16.04 subarches were named using the format
-# hwe-<first letter of release>. From 16.04 onwards kernels come in the format
-# hwe-<release version>. Because the version has a '.' in it we keep the old
-# naming format for the anchors.
-subarches:
- - &sa_hwe_p        [generic,           hwe-p]
- - &sa_hwe_q        [generic,           hwe-p, hwe-q]
- - &sa_hwe_r        [generic,           hwe-p, hwe-q, hwe-r]
- - &sa_hwe_s        [generic,           hwe-p, hwe-q, hwe-r, hwe-s]
- - &sa_hwe_t        [generic,           hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
- - &sa_hwe_u        [generic,           hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
- - &sa_hwe_v        [generic,           hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
- - &sa_hwe_w        [generic,           hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w]
- - &sa_hwe_x        [generic,           hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04]
- - &sa_hwe_x_edge   [generic,           hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, hwe-16.04, hwe-16.10]
- - &sa_hwe_x_legacy [generic,           hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x]
- - &sa_hwe_y        [generic,           hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10]
- - &sa_hwe_z        [generic,           hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10, ga-17.04]
- - &sa_hwe_a        [generic,           hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10, ga-17.04, ga-17.10]
- - &sa_hwe_b        [generic,           hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10, ga-17.04, ga-17.10, ga-18.04]
- - &sa_hwe_cc       [generic,           hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10, ga-17.04, ga-17.10, ga-18.04, ga-18.10]
- - &arm_hwe_t       [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
- - &arm_hwe_u       [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
- - &arm_hwe_v       [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
- - &arm_hwe_w       [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w]
- - &arm_hwe_x       [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04]
- - &arm_hwe_x_edge  [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, hwe-16.04, hwe-16.10]
- - &arm_hwe_y       [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10]
- - &arm_hwe_z       [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10, ga-17.04]
- - &arm_hwe_a       [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10, ga-17.04, ga-17.10]
- - &arm_hwe_b       [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10, ga-17.04, ga-17.10, ga-18.04]
- - &arm_hwe_cc      [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10, ga-17.04, ga-17.10, ga-18.04, ga-18.10]
-
-misc:
- - &glpae generic-lpae
- - &xguboot xgene-uboot
- - &mustang xgene-uboot-mustang
- - &kh-mustang {suffix: .xgene-mustang, kihelper: kh-xgene,
-               di-format: 'xgene', dtb: 'apm-mustang.dtb'}
- - &kh-xgene   {suffix: .xgene, kihelper: "kh-xgene", di-format: 'xgene'}
-
-releases:
- - version: "18.10"
-   release: cosmic
-   kernels:
-    - [cosmic,     amd64,    ga-18.10,        generic,     linux-signed-generic,                 *sa_hwe_cc]
-    - [cosmic,     amd64,    ga-18.10,        lowlatency,  linux-signed-image-lowlatency,        *sa_hwe_cc]
-    - [cosmic,     arm64,    ga-18.10,        generic,     linux-generic,                        *sa_hwe_cc]
-    - [cosmic,     arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *kh-mustang]
-    - [cosmic,     arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *kh-xgene]
-    - [cosmic,     armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae]]
-    - [cosmic,     armhf,    ga-18.10,        generic,     linux-generic,                        *arm_hwe_cc]
-    - [cosmic,     i386,     ga-18.10,        generic,     linux-generic,                        *sa_hwe_cc]
-    - [cosmic,     i386,     ga-18.10,        lowlatency,  linux-image-lowlatency,               *sa_hwe_cc]
-    - [cosmic,     ppc64el,  ga-18.10,        generic,     linux-generic,                        *sa_hwe_cc]
-    - [cosmic,     s390x,    ga-18.10,        generic,     linux-generic,                        *sa_hwe_cc]
- - version: "18.04"
-   release: bionic
-   kernels:
-    - [bionic,     amd64,    ga-18.04,        generic,     linux-signed-generic,                 *sa_hwe_b]
-    - [bionic,     amd64,    ga-18.04,        lowlatency,  linux-signed-image-lowlatency,        *sa_hwe_b]
-    - [bionic,     arm64,    ga-18.04,        generic,     linux-generic,                        *sa_hwe_b]
-    - [bionic,     arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *kh-mustang]
-    - [bionic,     arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *kh-xgene]
-    - [bionic,     armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae]]
-    - [bionic,     armhf,    ga-18.04,        generic,     linux-generic,                        *arm_hwe_b]
-    - [bionic,     i386,     ga-18.04,        generic,     linux-generic,                        *sa_hwe_b]
-    - [bionic,     i386,     ga-18.04,        lowlatency,  linux-image-lowlatency,               *sa_hwe_b]
-    - [bionic,     ppc64el,  ga-18.04,        generic,     linux-generic,                        *sa_hwe_b]
-    - [bionic,     s390x,    ga-18.04,        generic,     linux-generic,                        *sa_hwe_b]
- - version: "17.10"
-   release: artful
-   kernels:
-    - [artful,     amd64,    ga-17.10,        generic,     linux-signed-generic,                 *sa_hwe_a]
-    - [artful,     amd64,    ga-17.10,        lowlatency,  linux-signed-image-lowlatency,        *sa_hwe_a]
-    - [artful,     arm64,    ga-17.10,        generic,     linux-generic,                        *sa_hwe_a]
-    - [artful,     arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *kh-mustang]
-    - [artful,     arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *kh-xgene]
-    - [artful,     armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae]]
-    - [artful,     armhf,    ga-17.10,        generic,     linux-generic,                        *arm_hwe_a]
-    - [artful,     i386,     ga-17.10,        generic,     linux-generic,                        *sa_hwe_a]
-    - [artful,     i386,     ga-17.10,        lowlatency,  linux-image-lowlatency,               *sa_hwe_a]
-    - [artful,     ppc64el,  ga-17.10,        generic,     linux-generic,                        *sa_hwe_a]
-    - [artful,     s390x,    ga-17.10,        generic,     linux-generic,                        *sa_hwe_a]
- - version: "17.04"
-   release: zesty
-   kernels:
-    - [zesty,      amd64,    ga-17.04,        generic,     linux-signed-generic,                 *sa_hwe_z]
-    - [zesty,      amd64,    ga-17.04,        lowlatency,  linux-signed-image-lowlatency,        *sa_hwe_z]
-    - [zesty,      arm64,    ga-17.04,        generic,     linux-generic,                        *sa_hwe_z]
-    - [zesty,      arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *kh-mustang]
-    - [zesty,      arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *kh-xgene]
-    - [zesty,      armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae]]
-    - [zesty,      armhf,    ga-17.04,        generic,     linux-generic,                        *arm_hwe_z]
-    - [zesty,      i386,     ga-17.04,        generic,     linux-generic,                        *sa_hwe_z]
-    - [zesty,      i386,     ga-17.04,        lowlatency,  linux-image-lowlatency,               *sa_hwe_z]
-    - [zesty,      ppc64el,  ga-17.04,        generic,     linux-generic,                        *sa_hwe_z]
-    - [zesty,      s390x,    ga-17.04,        generic,     linux-generic,                        *sa_hwe_z]
- - version: "16.10"
-   release: yakkety
-   kernels:
-    - [yakkety,    amd64,    ga-16.10,        generic,     linux-signed-generic,                 *sa_hwe_y]
-    - [yakkety,    amd64,    ga-16.10,        lowlatency,  linux-signed-image-lowlatency,        *sa_hwe_y]
-    - [yakkety,    arm64,    ga-16.10,        generic,     linux-generic,                        *sa_hwe_y]
-    - [yakkety,    arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *kh-mustang]
-    - [yakkety,    arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *kh-xgene]
-    - [yakkety,    armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae]]
-    - [yakkety,    armhf,    ga-16.10,        generic,     linux-generic,                        *arm_hwe_y]
-    - [yakkety,    i386,     ga-16.10,        generic,     linux-generic,                        *sa_hwe_y]
-    - [yakkety,    i386,     ga-16.10,        lowlatency,  linux-image-lowlatency,               *sa_hwe_y]
-    - [yakkety,    ppc64el,  ga-16.10,        generic,     linux-generic,                        *sa_hwe_y]
-    - [yakkety,    s390x,    ga-16.10,        generic,     linux-generic,                        *sa_hwe_y]
- - version: "16.04"
-   release: xenial
-   kernels:
-    - [xenial,     amd64,    ga-16.04,        generic,     linux-signed-generic,                        *sa_hwe_x]
-    - [xenial,     amd64,    ga-16.04,        lowlatency,  linux-signed-lowlatency,                     *sa_hwe_x]
-    - [xenial,     amd64,    hwe-16.04,       generic,     linux-signed-generic-hwe-16.04,              *sa_hwe_x]
-    - [xenial,     amd64,    hwe-16.04,       lowlatency,  linux-signed-lowlatency-hwe-16.04,           *sa_hwe_x]
-    - [xenial,     amd64,    hwe-16.04-edge,  generic,     linux-signed-generic-hwe-16.04-edge,         *sa_hwe_x_edge]
-    - [xenial,     amd64,    hwe-16.04-edge,  lowlatency,  linux-signed-lowlatency-hwe-16.04-edge,      *sa_hwe_x_edge]
-    - [xenial,     arm64,    ga-16.04,        generic,     linux-generic,                        *sa_hwe_x]
-    - [xenial,     arm64,    hwe-16.04,       generic,     linux-generic-hwe-16.04,              *sa_hwe_x]
-    - [xenial,     arm64,    hwe-16.04-edge,  generic,     linux-generic-hwe-16.04-edge,         *sa_hwe_x_edge]
-    - [xenial,     arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *kh-mustang]
-    - [xenial,     arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *kh-xgene]
-    - [xenial,     armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae]]
-    - [xenial,     armhf,    ga-16.04,        generic,     linux-generic,                        *arm_hwe_x]
-    - [xenial,     armhf,    hwe-16.04,       generic,     linux-generic-hwe-16.04,              *arm_hwe_x]
-    - [xenial,     armhf,    hwe-16.04-edge,  generic,     linux-generic-hwe-16.04-edge,         *arm_hwe_x_edge]
-    - [xenial,     i386,     ga-16.04,        generic,     linux-generic,                        *sa_hwe_x]
-    - [xenial,     i386,     ga-16.04,        lowlatency,  linux-lowlatency,                     *sa_hwe_x]
-    - [xenial,     i386,     hwe-16.04,       generic,     linux-generic-hwe-16.04,              *sa_hwe_x]
-    - [xenial,     i386,     hwe-16.04,       lowlatency,  linux-lowlatency-hwe-16.04,           *sa_hwe_x]
-    - [xenial,     i386,     hwe-16.04-edge,  generic,     linux-generic-hwe-16.04-edge,         *sa_hwe_x_edge]
-    - [xenial,     i386,     hwe-16.04-edge,  lowlatency,  linux-lowlatency-hwe-16.04-edge,      *sa_hwe_x_edge]
-    - [xenial,     ppc64el,  ga-16.04,        generic,     linux-generic,                        *sa_hwe_x]
-    - [xenial,     ppc64el,  hwe-16.04,       generic,     linux-generic-hwe-16.04,              *sa_hwe_x]
-    - [xenial,     ppc64el,  hwe-16.04-edge,  generic,     linux-generic-hwe-16.04-edge,         *sa_hwe_x_edge]
-    - [xenial,     s390x,    ga-16.04,        generic,     linux-generic,                        *sa_hwe_x]
-    - [xenial,     s390x,    hwe-16.04,       generic,     linux-generic-hwe-16.04,              *sa_hwe_x]
-    - [xenial,     s390x,    hwe-16.04-edge,  generic,     linux-generic-hwe-16.04-edge,         *sa_hwe_x_edge]
- - version: "14.04"
-   builtin_kernel: linux-generic
-   release: trusty
-   kernels:
-    - [trusty,  armhf,   hwe-t,     generic,    linux-generic,                     *arm_hwe_t]
-    - [trusty,  armhf,   *glpae,    *glpae,     linux-generic-lpae,                [*glpae]]
-    - [trusty,  i386,    hwe-t,     generic,    linux-generic,                     *sa_hwe_t]
-    - [trusty,  amd64,   hwe-t,     generic,    linux-signed-generic,              *sa_hwe_t]
-    - [trusty,  ppc64el, hwe-t,     generic,    linux-generic,                     *sa_hwe_t]
-    - [trusty,  arm64,   hwe-t,     generic,    linux-generic,                     *sa_hwe_t]
-    - [trusty,  arm64,   *xguboot,  generic,    linux-generic,                     [*xguboot], *kh-xgene]
-    - [trusty,  arm64,   *mustang,  generic,    linux-generic,                     [*mustang], *kh-mustang]
-    - [utopic,  amd64,   hwe-u,     generic,    linux-signed-generic-lts-utopic,   *sa_hwe_u]
-    - [utopic,  arm64,   hwe-u,     generic,    linux-generic-lts-utopic,          *sa_hwe_u]
-    - [utopic,  armhf,   hwe-u,     generic,    linux-generic-lts-utopic,          *sa_hwe_u]
-    - [utopic,  i386,    hwe-u,     generic,    linux-generic-lts-utopic,          *sa_hwe_u]
-    - [utopic,  ppc64el, hwe-u,     generic,    linux-generic-lts-utopic,          *sa_hwe_u]
-    - [vivid,   amd64,   hwe-v,     generic,    linux-signed-generic-lts-vivid,    *sa_hwe_v]
-    - [vivid,   arm64,   hwe-v,     generic,    linux-generic-lts-vivid,           *sa_hwe_v]
-    - [vivid,   armhf,   hwe-v,     generic,    linux-generic-lts-vivid,           *sa_hwe_v]
-    - [vivid,   i386,    hwe-v,     generic,    linux-generic-lts-vivid,           *sa_hwe_v]
-    - [vivid,   ppc64el, hwe-v,     generic,    linux-generic-lts-vivid,           *sa_hwe_v]
-    - [wily,    amd64,   hwe-w,     generic,    linux-signed-generic-lts-wily,     *sa_hwe_w]
-    - [wily,    arm64,   hwe-w,     generic,    linux-generic-lts-wily,            *sa_hwe_w]
-    - [wily,    armhf,   hwe-w,     generic,    linux-generic-lts-wily,            *sa_hwe_w]
-    - [wily,    i386,    hwe-w,     generic,    linux-generic-lts-wily,            *sa_hwe_w]
-    - [wily,    ppc64el, hwe-w,     generic,    linux-generic-lts-wily,            *sa_hwe_w]
-    - [xenial,  amd64,   hwe-x,     generic,    linux-signed-generic-lts-xenial,   *sa_hwe_x_legacy]
-    - [xenial,  amd64,   hwe-x,     lowlatency, linux-signed-lowlatency-lts-xenial, *sa_hwe_x_legacy]
-    - [xenial,  arm64,   hwe-x,     generic,    linux-generic-lts-xenial,          *sa_hwe_x_legacy]
-    - [xenial,  armhf,   hwe-x,     generic,    linux-generic-lts-xenial,          *sa_hwe_x_legacy]
-    - [xenial,  i386,    hwe-x,     generic,    linux-generic-lts-xenial,          *sa_hwe_x_legacy]
-    - [xenial,  i386,    hwe-x,     lowlatency, linux-lowlatency,                  *sa_hwe_x_legacy]
-    - [xenial,  ppc64el, hwe-x,     generic,    linux-generic-lts-xenial,          *sa_hwe_x_legacy]
- - version: "12.04"
-   release: precise
-   builtin_kernel: {armhf: linux-highbank, default: 'linux-generic'}
-   kernels:
-    - [precise, i386,    hwe-p,    generic,  linux-generic,             *sa_hwe_p]
-    - [precise, amd64,   hwe-p,    generic,  linux-generic,             *sa_hwe_p]
-    - [precise, armhf,   highbank, highbank, linux-highbank,            [highbank]]
-    - [quantal, i386,    hwe-q,    generic,  linux-generic-lts-quantal, *sa_hwe_q]
-    - [quantal, amd64,   hwe-q,    generic,  linux-signed-generic-lts-quantal, *sa_hwe_q]
-    - [raring,  i386,    hwe-r,    generic,  linux-generic-lts-raring,  *sa_hwe_r]
-    - [raring,  amd64,   hwe-r,    generic,  linux-signed-generic-lts-raring,  *sa_hwe_r]
-    - [saucy,   i386,    hwe-s,    generic,  linux-generic-lts-saucy,   *sa_hwe_s]
-    - [saucy,   amd64,   hwe-s,    generic,  linux-signed-generic-lts-saucy,   *sa_hwe_s]
-    - [trusty,  i386,    hwe-t,    generic,  linux-generic-lts-trusty,  *sa_hwe_t]
-    - [trusty,  amd64,   hwe-t,    generic,  linux-signed-generic-lts-trusty,  *sa_hwe_t]
-
-# enable_proposed: True
-
-# If available pull and publish SquashFS images from upstream
-squashfs: True
-
-## Notes:
-##  * there are no hwe installer kernels for armhf
-##    nothing named 'saucy-highbank' at
-##     http://ports.ubuntu.com/ubuntu-ports/dists/precise-updates/main/installer-armhf/current/images/MD5SUMS
-##    so for now, we just don't have a stream for that.
-##  * kernel meta package in all cases here is linux-image-<flavor>
-
-default_target: http://images.maas.io/ephemeral-v3/daily/streams/v1/com.ubuntu.maas:daily:v3:download.json
-content_id: com.ubuntu.maas:daily:v3:download
-product_id_pre: com.ubuntu.maas.daily:v3:boot
-
-# By default maas-images uses the krel in the boot path. This worked for the v2
-# stream because there was only one kernel per release/arch/krel/kflavor. The
-# v3 stream has multiple kernels per release/arch/krel/kflavor so use the
-# subarch instead.
-kname: '%(subarch)s'
-
-# vi: syntax=yaml nowrap

=== removed directory 'curtin'
=== removed directory 'curtin/centos6'
=== removed symlink 'curtin/centos6/curtin-hooks'
=== target was u'python_wrapper'
=== removed file 'curtin/centos6/curtin-hooks.py'
--- curtin/centos6/curtin-hooks.py	2017-08-02 19:10:25 +0000
+++ curtin/centos6/curtin-hooks.py	1970-01-01 00:00:00 +0000
@@ -1,393 +0,0 @@
-#!/usr/bin/env python
-
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-import codecs
-import os
-import re
-import sys
-
-from curtin import (
-    block,
-    config,
-    util,
-    )
-
-try:
-    from curtin import FEATURES as curtin_features
-except ImportError:
-    curtin_features = []
-
-write_files = None
-try:
-    from curtin.futil import write_files
-except ImportError:
-    pass
-
-centos_apply_network_config = None
-try:
-    if 'CENTOS_APPLY_NETWORK_CONFIG' in curtin_features:
-        from curtin.commands.curthooks import centos_apply_network_config
-except ImportError:
-    pass
-
-"""
-CentOS 6
-
-Currently Support:
-
-- Legacy boot
-- DHCP of BOOTIF
-
-Not Supported:
-
-- UEFI boot (*Bad support, most likely wont support)
-- Multiple network configration
-- IPv6
-"""
-
-FSTAB_PREPEND = """\
-#
-# /etc/fstab
-# Created by MAAS fast-path installer.
-#
-# Accessible filesystems, by reference, are maintained under '/dev/disk'
-# See man pages fstab(5), findfs(8), mount(8) and/or blkid(8) for more info
-#
-"""
-
-FSTAB_APPEND = """\
-tmpfs                   /dev/shm                tmpfs   defaults        0 0
-devpts                  /dev/pts                devpts  gid=5,mode=620  0 0
-sysfs                   /sys                    sysfs   defaults        0 0
-proc                    /proc                   proc    defaults        0 0
-"""
-
-GRUB_CONF = """\
-#
-# /boot/grub/grub.conf
-# Created by MAAS fast-path installer.
-#
-default 0
-timeout 0
-title MAAS
- root {grub_root}
- kernel /boot/{vmlinuz} root=UUID={root_uuid} {extra_opts}
- initrd /boot/{initrd}
-"""
-
-
-def get_block_devices(target):
-    """Returns list of block devices for the given target."""
-    devs = block.get_devices_for_mp(target)
-    blockdevs = set()
-    for maybepart in devs:
-        (blockdev, part) = block.get_blockdev_for_partition(maybepart)
-        blockdevs.add(blockdev)
-    return list(blockdevs)
-
-
-def get_root_info(target):
-    """Returns the root partitions information."""
-    rootpath = block.get_devices_for_mp(target)[0]
-    rootdev = os.path.basename(rootpath)
-    blocks = block._lsblock()
-    return blocks[rootdev]
-
-
-def read_file(path):
-    """Returns content of a file."""
-    with codecs.open(path, encoding='utf-8') as stream:
-        return stream.read()
-
-
-def write_fstab(target, curtin_fstab):
-    """Writes the new fstab, using the fstab provided
-    from curtin."""
-    fstab_path = os.path.join(target, 'etc', 'fstab')
-    fstab_data = read_file(curtin_fstab)
-    with open(fstab_path, 'w') as stream:
-        stream.write(FSTAB_PREPEND)
-        stream.write(fstab_data)
-        stream.write(FSTAB_APPEND)
-
-
-def extract_kernel_params(data):
-    """Extracts the kernel parametes from the provided
-    grub config data."""
-    match = re.search('^\s+kernel (.+?)$', data, re.MULTILINE)
-    return match.group(0)
-
-
-def strip_kernel_params(params, strip_params=[]):
-    """Removes un-needed kernel parameters."""
-    new_params = []
-    for param in params:
-        remove = False
-        for strip in strip_params:
-            if param.startswith(strip):
-                remove = True
-                break
-        if remove is False:
-            new_params.append(param)
-    return new_params
-
-
-def get_boot_file(target, filename):
-    """Return the full filename of file in /boot on target."""
-    boot_dir = os.path.join(target, 'boot')
-    files = [
-        fname
-        for fname in os.listdir(boot_dir)
-        if fname.startswith(filename)
-        ]
-    if not files:
-        return None
-    return files[0]
-
-
-def write_grub_conf(target, grub_root, extra=[]):
-    """Writes a new /boot/grub/grub.conf with the correct
-    boot arguments."""
-    root_info = get_root_info(target)
-    grub_path = os.path.join(target, 'boot', 'grub', 'grub.conf')
-    extra_opts = ' '.join(extra)
-    vmlinuz = get_boot_file(target, 'vmlinuz')
-    initrd = get_boot_file(target, 'initramfs')
-    with open(grub_path, 'w') as stream:
-        stream.write(
-            GRUB_CONF.format(
-                grub_root=grub_root,
-                vmlinuz=vmlinuz,
-                initrd=initrd,
-                root_uuid=root_info['UUID'],
-                extra_opts=extra_opts) + '\n')
-
-
-def get_extra_kernel_parameters():
-    """Extracts the extra kernel commands from /proc/cmdline
-    that should be placed onto the host.
-
-    Any command following the '--' entry should be placed
-    onto the host.
-    """
-    cmdline = read_file('/proc/cmdline')
-    cmdline = cmdline.split()
-    if '--' not in cmdline:
-        return []
-    idx = cmdline.index('--') + 1
-    if idx >= len(cmdline) + 1:
-        return []
-    return strip_kernel_params(
-        cmdline[idx:],
-        strip_params=['initrd=', 'BOOT_IMAGE=', 'BOOTIF='])
-
-
-def get_grub_root(target):
-    """Extracts the grub root (hdX,X) from the grub command.
-
-    This is used so the correct root device is used to install
-    stage1/stage2 boot loader.
-
-    Note: grub-install normally does all of this for you, but
-    since the grub is older, it has an issue with the ISCSI
-    target as /dev/sda and cannot enumarate it with the BIOS.
-    """
-    with util.RunInChroot(target) as in_chroot:
-        data = '\n'.join([
-            'find /boot/grub/stage1',
-            'quit',
-            ]).encode('utf-8')
-        out, err = in_chroot(['grub', '--batch'],
-                             data=data, capture=True)
-        regex = re.search('^\s+(\(.+?\))$', out, re.MULTILINE)
-        return regex.groups()[0]
-
-
-def grub_install(target, root):
-    """Installs grub onto the root."""
-    root_dev = root.split(',')[0] + ')'
-    with util.RunInChroot(target) as in_chroot:
-        data = '\n'.join([
-            'root %s' % root,
-            'setup %s' % root_dev,
-            'quit',
-            ]).encode('utf-8')
-        in_chroot(['grub', '--batch'],
-                  data=data)
-
-
-def set_autorelabel(target):
-    """Creates file /.autorelabel.
-
-    This is used by SELinux to relabel all of the
-    files on the filesystem to have the correct
-    security context. Without this SSH login will
-    fail.
-    """
-    path = os.path.join(target, '.autorelabel')
-    open(path, 'a').close()
-
-
-def get_boot_mac():
-    """Return the mac address of the booting interface."""
-    cmdline = read_file('/proc/cmdline')
-    cmdline = cmdline.split()
-    try:
-        bootif = [
-            option
-            for option in cmdline
-            if option.startswith('BOOTIF')
-            ][0]
-    except IndexError:
-        return None
-    _, mac = bootif.split('=')
-    mac = mac.split('-')[1:]
-    return ':'.join(mac)
-
-
-def get_interface_names():
-    """Return a dictionary mapping mac addresses to interface names."""
-    sys_path = "/sys/class/net"
-    ifaces = {}
-    for iname in os.listdir(sys_path):
-        mac = read_file(os.path.join(sys_path, iname, "address"))
-        mac = mac.strip().lower()
-        ifaces[mac] = iname
-    return ifaces
-
-
-def get_ipv4_config(iface, data):
-    """Returns the contents of the interface file for ipv4."""
-    config = [
-        'TYPE="Ethernet"',
-        'NM_CONTROLLED="no"',
-        'USERCTL="yes"',
-        ]
-    if 'hwaddress' in data:
-        config.append('HWADDR="%s"' % data['hwaddress'])
-    else:
-        # Last ditch effort, use the device name, it probably won't match
-        # though!
-        config.append('DEVICE="%s"' % iface)
-    if data['auto']:
-        config.append('ONBOOT="yes"')
-    else:
-        config.append('ONBOOT="no"')
-
-    method = data['method']
-    if method == 'dhcp':
-        config.append('BOOTPROTO="dhcp"')
-        config.append('PEERDNS="yes"')
-        config.append('PERSISTENT_DHCLIENT="1"')
-        if 'hostname' in data:
-            config.append('DHCP_HOSTNAME="%s"' % data['hostname'])
-    elif method == 'static':
-        config.append('BOOTPROTO="none"')
-        config.append('IPADDR="%s"' % data['address'])
-        config.append('NETMASK="%s"' % data['netmask'])
-        if 'broadcast' in data:
-            config.append('BROADCAST="%s"' % data['broadcast'])
-        if 'gateway' in data:
-            config.append('GATEWAY="%s"' % data['gateway'])
-    elif method == 'manual':
-        config.append('BOOTPROTO="none"')
-    return '\n'.join(config)
-
-
-def write_interface_config(target, iface, data):
-    """Writes config for interface."""
-    family = data['family']
-    if family != "inet":
-        # Only supporting ipv4 currently
-        print(
-            "WARN: unsupported family %s, "
-            "failed to configure interface: %s" (family, iface))
-        return
-    config = get_ipv4_config(iface, data)
-    path = os.path.join(
-        target, 'etc', 'sysconfig', 'network-scripts', 'ifcfg-%s' % iface)
-    with open(path, 'w') as stream:
-        stream.write(config + '\n')
-
-
-def write_network_config(target, mac):
-    """Write network configuration for the given MAC address."""
-    inames = get_interface_names()
-    iname = inames[mac.lower()]
-    write_interface_config(
-        target, iname, {
-            'family': 'inet',
-            'hwaddress': mac.upper(),
-            'auto': True,
-            'method': 'dhcp'
-        })
-
-
-def apply_networking(cfg, target, bootmac):
-    if 'network' in cfg and centos_apply_network_config:
-        centos_apply_network_config(cfg['network'], target)
-        return
-
-    if 'network' in cfg:
-        sys.stderr.write("WARN: network configuration provided, but "
-                         "no support for applying. Using basic config.")
-    write_network_config(target, bootmac)
-
-
-def handle_cloudconfig(cfg, target):
-    if not cfg.get('cloudconfig'):
-        return
-    if not write_files:
-        sys.stderr.write(
-            "WARN: Unable to handle 'cloudconfig' section in config."
-            "No 'write_files' found from curtin.\n")
-        return
-
-    base_dir = os.path.join(target, 'etc/cloud/cloud.cfg.d')
-    write_files(cfg['cloudconfig'], base_dir)
-
-
-def main():
-    state = util.load_command_environment()
-    target = state['target']
-    if target is None:
-        print("Target was not provided in the environment.")
-        sys.exit(1)
-    fstab = state['fstab']
-    if fstab is None:
-        print("/etc/fstab output was not provided in the environment.")
-        sys.exit(1)
-    bootmac = get_boot_mac()
-    if bootmac is None:
-        print("Unable to determine boot interface.")
-        sys.exit(1)
-    devices = get_block_devices(target)
-    if not devices:
-        print("Unable to find block device for: %s" % target)
-        sys.exit(1)
-
-    write_fstab(target, fstab)
-
-    grub_root = get_grub_root(target)
-    write_grub_conf(target, grub_root, extra=get_extra_kernel_parameters())
-    grub_install(target, grub_root)
-
-    set_autorelabel(target)
-
-    if state.get('config'):
-        cfg = config.load_config(state['config'])
-    else:
-        cfg = {}
-
-    handle_cloudconfig(cfg, target)
-
-    apply_networking(cfg, target, bootmac)
-
-
-if __name__ == "__main__":
-    main()

=== removed symlink 'curtin/centos6/finalize'
=== target was u'python_wrapper'
=== removed file 'curtin/centos6/finalize.py'
--- curtin/centos6/finalize.py	2016-05-11 18:47:46 +0000
+++ curtin/centos6/finalize.py	1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-#!/usr/bin/env python
-
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-import json
-import os
-import sys
-
-from curtin import util
-
-
-DATASOURCE_LIST = """\
-datasource_list: [ MAAS ]
-"""
-
-DATASOURCE = """\
-datasource:
-  MAAS: {{consumer_key: {consumer_key}, metadata_url: '{url}',
-    token_key: {token_key}, token_secret: {token_secret}}}
-"""
-
-
-def get_datasource(**kwargs):
-    """Returns the format cloud-init datasource."""
-    return DATASOURCE_LIST + DATASOURCE.format(**kwargs)
-
-
-def load_config(path):
-    """Loads the curtin config."""
-    with open(path, 'r') as stream:
-        return json.load(stream)
-
-
-def extract_maas_parameters(config):
-    """Extracts the needed values from the debconf
-    entry."""
-    params = {}
-    for line in config.splitlines():
-        cloud, key, type, value = line.split()[:4]
-        if key == "cloud-init/maas-metadata-url":
-            params['url'] = value
-        elif key == "cloud-init/maas-metadata-credentials":
-            values = value.split("&")
-            for oauth in values:
-                key, value = oauth.split('=')
-                if key == 'oauth_token_key':
-                    params['token_key'] = value
-                elif key == 'oauth_token_secret':
-                    params['token_secret'] = value
-                elif key == 'oauth_consumer_key':
-                    params['consumer_key'] = value
-    return params
-
-
-def get_maas_debconf_selections(config):
-    """Gets the debconf selections from the curtin config."""
-    try:
-        return config['debconf_selections']['maas']
-    except KeyError:
-        return None
-
-
-def write_datasource(target, data):
-    """Writes the cloudinit config into
-    /etc/cloud/cloud.cfg.d/90_datasource.cfg."""
-    path = os.path.join(
-        target, 'etc', 'cloud', 'cloud.cfg.d', '90_datasource.cfg')
-    with open(path, 'w') as stream:
-        stream.write(data + '\n')
-
-
-def main():
-    state = util.load_command_environment()
-    target = state['target']
-    if target is None:
-        print("Target was not provided in the environment.")
-        sys.exit(1)
-    config_f = state['config']
-    if config_f is None:
-        print("Config was not provided in the environment.")
-        sys.exit(1)
-    config = load_config(config_f)
-
-    debconf = get_maas_debconf_selections(config)
-    if debconf is None:
-        print("Failed to get the debconf_selections.")
-        sys.exit(1)
-
-    params = extract_maas_parameters(debconf)
-    datasource = get_datasource(**params)
-    write_datasource(target, datasource)
-
-
-if __name__ == "__main__":
-    main()

=== removed file 'curtin/centos6/python_wrapper'
--- curtin/centos6/python_wrapper	2016-05-11 18:47:46 +0000
+++ curtin/centos6/python_wrapper	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-export PYTHONPATH='/curtin'
-
-# Ubuntu 16.04 only ships with Python 3 while previous versions only ship
-# with Python 2.
-if type -p python > /dev/null; then
-    exec python "$0.py" "$@"
-else
-    exec python3 "$0.py" "$@"
-fi

=== removed directory 'curtin/centos7'
=== removed symlink 'curtin/centos7/curtin-hooks'
=== target was u'python_wrapper'
=== removed file 'curtin/centos7/curtin-hooks.py'
--- curtin/centos7/curtin-hooks.py	2018-08-17 20:11:27 +0000
+++ curtin/centos7/curtin-hooks.py	1970-01-01 00:00:00 +0000
@@ -1,396 +0,0 @@
-#!/usr/bin/env python
-
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-import codecs
-import importlib
-import os
-import re
-import sys
-
-from curtin import (
-    block,
-    config,
-    log,
-    util,
-    )
-
-
-def try_import(path, unavailable=None, condition=True):
-    """Import path (module.submodule.attribute) and return it.
-    return unavailable if
-      - condition is not true
-      - import fails
-      - attribute does not exist in module."""
-    if not condition:
-        return unavailable
-    modname, _, attrname = path.rpartition(".")
-    try:
-        mod = importlib.import_module(modname)
-        imported = getattr(mod, attrname, None)
-    except ImportError:
-        imported = None
-    return imported if imported else unavailable
-
-
-curtin_features = try_import("curtin.FEATURES", [])
-write_files = try_import("curtin.futil.write_files")
-centos_apply_network_config = try_import(
-    "curtin.commands.curthooks.centos_apply_network_config",
-    condition='CENTOS_APPLY_NETWORK_CONFIG' in curtin_features)
-centos_curthooks = try_import(
-    "curtin.commands.curthooks.builtin_curthooks",
-    condition='CENTOS_CURTHOOK_SUPPORT' in curtin_features)
-
-
-FSTAB_PREPEND = """\
-#
-# /etc/fstab
-# Created by MAAS fast-path installer.
-#
-# Accessible filesystems, by reference, are maintained under '/dev/disk'
-# See man pages fstab(5), findfs(8), mount(8) and/or blkid(8) for more info
-#
-"""
-
-FSTAB_UEFI = """\
-LABEL=uefi-boot /boot/efi vfat defaults 0 0
-"""
-
-GRUB_PREPEND = """\
-# Set by MAAS fast-path installer.
-GRUB_TIMEOUT=0
-GRUB_TERMINAL_OUTPUT=console
-GRUB_DISABLE_OS_PROBER=true
-"""
-
-
-def get_block_devices(target):
-    """Returns list of block devices for the given target."""
-    devs = block.get_devices_for_mp(target)
-    blockdevs = set()
-    for maybepart in devs:
-        (blockdev, part) = block.get_blockdev_for_partition(maybepart)
-        blockdevs.add(blockdev)
-    return list(blockdevs)
-
-
-def get_root_info(target):
-    """Returns the root partitions information."""
-    rootpath = block.get_devices_for_mp(target)[0]
-    rootdev = os.path.basename(rootpath)
-    blocks = block._lsblock()
-    return blocks[rootdev]
-
-
-def read_file(path):
-    """Returns content of a file."""
-    with codecs.open(path, encoding='utf-8') as stream:
-        return stream.read()
-
-
-def write_fstab(target, curtin_fstab):
-    """Writes the new fstab, using the fstab provided
-    from curtin."""
-    fstab_path = os.path.join(target, 'etc', 'fstab')
-    fstab_data = read_file(curtin_fstab)
-    with open(fstab_path, 'w') as stream:
-        stream.write(FSTAB_PREPEND)
-        stream.write(fstab_data)
-        if util.is_uefi_bootable():
-            stream.write(FSTAB_UEFI)
-
-
-def strip_kernel_params(params, strip_params=[]):
-    """Removes un-needed kernel parameters."""
-    new_params = []
-    for param in params:
-        remove = False
-        for strip in strip_params:
-            if param.startswith(strip):
-                remove = True
-                break
-        if remove is False:
-            new_params.append(param)
-    return new_params
-
-
-def get_extra_kernel_parameters():
-    """Extracts the extra kernel commands from /proc/cmdline
-    that should be placed onto the host.
-
-    Any command following the '--' entry should be placed
-    onto the host.
-    """
-    cmdline = read_file('/proc/cmdline')
-    cmdline = cmdline.split()
-    if '--' not in cmdline:
-        return []
-    idx = cmdline.index('--') + 1
-    if idx >= len(cmdline) + 1:
-        return []
-    return strip_kernel_params(
-        cmdline[idx:],
-        strip_params=['initrd=', 'BOOT_IMAGE=', 'BOOTIF='])
-
-
-def update_grub_default(target, extra=[]):
-    """Updates /etc/default/grub with the correct options."""
-    grub_default_path = os.path.join(target, 'etc', 'default', 'grub')
-    kernel_cmdline = ' '.join(extra)
-    with open(grub_default_path, 'a') as stream:
-        stream.write(GRUB_PREPEND)
-        stream.write('GRUB_CMDLINE_LINUX=\"%s\"\n' % kernel_cmdline)
-
-
-def grub2_install(target, root):
-    """Installs grub2 to the root."""
-    with util.RunInChroot(target) as in_chroot:
-        in_chroot(['grub2-install', '--recheck', root])
-
-
-def grub2_mkconfig(target):
-    """Writes the new grub2 config."""
-    with util.RunInChroot(target) as in_chroot:
-        in_chroot(['grub2-mkconfig', '-o', '/boot/grub2/grub.cfg'])
-
-
-def get_efibootmgr_value(output, key):
-    """Parses the `output` from 'efibootmgr' to return value for `key`."""
-    for line in output.splitlines():
-        split = line.split(':')
-        if len(split) == 2:
-            curr_key = split[0].strip()
-            value = split[1].strip()
-            if curr_key == key:
-                return value
-
-
-def get_file_efi_loaders(output):
-    """Parses the `output` from 'efibootmgr' to return all loaders that exist
-    in '\EFI' path."""
-    return re.findall(
-        r"^Boot(?P<hex>[0-9a-fA-F]{4})\*?\s*\S+\s+.*File\(\\EFI.*$",
-        output, re.MULTILINE)
-
-
-def grub2_install_efi(target):
-    """Configure for EFI.
-
-    First capture the currently booted loader (normally a network device),
-    then perform grub installation (adds a new bootloader and adjusts the
-    boot order), finally re-adjust the boot order so that the currently booted
-    loader is set to boot first in the new order.
-    """
-    with util.RunInChroot(target) as in_chroot:
-        stdout, _ = in_chroot(['efibootmgr', '-v'], capture=True)
-        currently_booted = get_efibootmgr_value(stdout, 'BootCurrent')
-        loaders = get_file_efi_loaders(stdout)
-        if currently_booted in loaders:
-            loaders.remove(currently_booted)
-        for loader in loaders:
-            in_chroot(['efibootmgr', '-B', '-b', loader], capture=True)
-        in_chroot([
-            'grub2-install', '--target=x86_64-efi',
-            '--efi-directory', '/boot/efi',
-            '--recheck'])
-        stdout, _ = in_chroot(['efibootmgr'], capture=True)
-        currently_booted = get_efibootmgr_value(stdout, 'BootCurrent')
-        boot_order = get_efibootmgr_value(stdout, 'BootOrder').split(',')
-        if currently_booted in boot_order:
-            boot_order.remove(currently_booted)
-        boot_order = [currently_booted] + boot_order
-        new_boot_order = ','.join(boot_order)
-        in_chroot(['efibootmgr', '-o', new_boot_order])
-
-
-def set_autorelabel(target):
-    """Creates file /.autorelabel.
-
-    This is used by SELinux to relabel all of the
-    files on the filesystem to have the correct
-    security context. Without this SSH login will
-    fail.
-    """
-    path = os.path.join(target, '.autorelabel')
-    open(path, 'a').close()
-
-
-def get_boot_mac():
-    """Return the mac address of the booting interface."""
-    cmdline = read_file('/proc/cmdline')
-    cmdline = cmdline.split()
-    try:
-        bootif = [
-            option
-            for option in cmdline
-            if option.startswith('BOOTIF')
-            ][0]
-    except IndexError:
-        return None
-    _, mac = bootif.split('=')
-    mac = mac.split('-')[1:]
-    return ':'.join(mac)
-
-
-def get_interface_names():
-    """Return a dictionary mapping mac addresses to interface names."""
-    sys_path = "/sys/class/net"
-    ifaces = {}
-    for iname in os.listdir(sys_path):
-        mac = read_file(os.path.join(sys_path, iname, "address"))
-        mac = mac.strip().lower()
-        ifaces[mac] = iname
-    return ifaces
-
-
-def get_ipv4_config(iface, data):
-    """Returns the contents of the interface file for ipv4."""
-    config = [
-        'TYPE="Ethernet"',
-        'NM_CONTROLLED="no"',
-        'USERCTL="yes"',
-        ]
-    if 'hwaddress' in data:
-        config.append('HWADDR="%s"' % data['hwaddress'])
-    # Fallback to using device name
-    else:
-        config.append('DEVICE="%"' % iface)
-    if data['auto']:
-        config.append('ONBOOT="yes"')
-    else:
-        config.append('ONBOOT="no"')
-
-    method = data['method']
-    if method == 'dhcp':
-        config.append('BOOTPROTO="dhcp"')
-        config.append('PEERDNS="yes"')
-        config.append('PERSISTENT_DHCLIENT="1"')
-        if 'hostname' in data:
-            config.append('DHCP_HOSTNAME="%s"' % data['hostname'])
-    elif method == 'static':
-        config.append('BOOTPROTO="none"')
-        config.append('IPADDR="%s"' % data['address'])
-        config.append('NETMASK="%s"' % data['netmask'])
-        if 'broadcast' in data:
-            config.append('BROADCAST="%s"' % data['broadcast'])
-        if 'gateway' in data:
-            config.append('GATEWAY="%s"' % data['gateway'])
-    elif method == 'manual':
-        config.append('BOOTPROTO="none"')
-    return '\n'.join(config)
-
-
-def write_interface_config(target, iface, data):
-    """Writes config for interface."""
-    family = data['family']
-    if family != "inet":
-        # Only supporting ipv4 currently
-        print(
-            "WARN: unsupported family %s, "
-            "failed to configure interface: %s" (family, iface))
-        return
-    config = get_ipv4_config(iface, data)
-    path = os.path.join(
-        target, 'etc', 'sysconfig', 'network-scripts', 'ifcfg-%s' % iface)
-    with open(path, 'w') as stream:
-        stream.write(config + '\n')
-
-
-def write_network_config(target, mac):
-    """Write network configuration for the given MAC address."""
-    inames = get_interface_names()
-    iname = inames[mac.lower()]
-    write_interface_config(
-        target, iname, {
-            'family': 'inet',
-            'hwaddress': mac.upper(),
-            'auto': True,
-            'method': 'dhcp'
-        })
-
-
-def apply_networking(cfg, target, bootmac):
-    if 'network' in cfg and centos_apply_network_config:
-        centos_apply_network_config(cfg['network'], target)
-        return
-
-    if 'network' in cfg:
-        sys.stderr.write("WARN: network configuration provided, but "
-                         "no support for applying. Using basic config.")
-    write_network_config(target, bootmac)
-
-
-def handle_cloudconfig(cfg, target):
-    if not cfg.get('cloudconfig'):
-        return
-    if not write_files:
-        sys.stderr.write(
-            "WARN: Unable to handle 'cloudconfig' section in config."
-            "No 'write_files' found from curtin.\n")
-        return
-
-    base_dir = os.path.join(target, 'etc/cloud/cloud.cfg.d')
-    write_files(cfg['cloudconfig'], base_dir)
-
-
-def main():
-    # Enable logging to stdout for curtin functions
-    verbosity = int(os.environ.get("CURTIN_VERBOSITY", 1))
-    log.basicConfig(stream=sys.stdout, verbosity=verbosity)
-
-    state = util.load_command_environment()
-    target = state['target']
-    if target is None:
-        print("Target was not provided in the environment.")
-        sys.exit(1)
-    fstab = state['fstab']
-    if fstab is None:
-        print("/etc/fstab output was not provided in the environment.")
-        sys.exit(1)
-    bootmac = get_boot_mac()
-    if bootmac is None:
-        print("Unable to determine boot interface.")
-        sys.exit(1)
-    devices = get_block_devices(target)
-    if not devices:
-        print("Unable to find block device for: %s" % target)
-        sys.exit(1)
-
-    if state.get('config'):
-        cfg = config.load_config(state['config'])
-    else:
-        cfg = {}
-
-    # Run builtin hooks if curtin has the feature and maas sent storage cfg
-    if centos_curthooks and cfg.get('storage'):
-        # centos_curthooks will complete successfully or raise an exception.
-        # Not handling the exception here means we will exit this program with
-        # a non-zero value
-        centos_curthooks(cfg, target, state)
-        return
-
-    write_fstab(target, fstab)
-
-    update_grub_default(
-        target, extra=get_extra_kernel_parameters())
-    grub2_mkconfig(target)
-    if util.is_uefi_bootable():
-        grub2_install_efi(target)
-    else:
-        for dev in devices:
-            grub2_install(target, dev)
-
-    set_autorelabel(target)
-
-    handle_cloudconfig(cfg, target)
-
-    apply_networking(cfg, target, bootmac)
-
-
-if __name__ == "__main__":
-    main()

=== removed symlink 'curtin/centos7/finalize'
=== target was u'python_wrapper'
=== removed file 'curtin/centos7/finalize.py'
--- curtin/centos7/finalize.py	2018-09-13 08:07:51 +0000
+++ curtin/centos7/finalize.py	1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
-#!/usr/bin/env python
-
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-import json
-import os
-import sys
-
-from curtin import util
-try:
-    from curtin import FEATURES as curtin_features
-except ImportError:
-    curtin_features = []
-
-
-DATASOURCE_LIST = """\
-datasource_list: [ MAAS ]
-"""
-
-DATASOURCE = """\
-datasource:
-  MAAS: {{consumer_key: {consumer_key}, metadata_url: '{url}',
-    token_key: {token_key}, token_secret: {token_secret}}}
-"""
-
-
-def get_datasource(**kwargs):
-    """Returns the format cloud-init datasource."""
-    return DATASOURCE_LIST + DATASOURCE.format(**kwargs)
-
-
-def load_config(path):
-    """Loads the curtin config."""
-    with open(path, 'r') as stream:
-        return json.load(stream)
-
-
-def extract_maas_parameters(config):
-    """Extracts the needed values from the debconf
-    entry."""
-    params = {}
-    for line in config.splitlines():
-        cloud, key, type, value = line.split()[:4]
-        if key == "cloud-init/maas-metadata-url":
-            params['url'] = value
-        elif key == "cloud-init/maas-metadata-credentials":
-            values = value.split("&")
-            for oauth in values:
-                key, value = oauth.split('=')
-                if key == 'oauth_token_key':
-                    params['token_key'] = value
-                elif key == 'oauth_token_secret':
-                    params['token_secret'] = value
-                elif key == 'oauth_consumer_key':
-                    params['consumer_key'] = value
-    return params
-
-
-def get_maas_debconf_selections(config):
-    """Gets the debconf selections from the curtin config."""
-    try:
-        return config['debconf_selections']['maas']
-    except KeyError:
-        return None
-
-
-def write_datasource(target, data):
-    """Writes the cloudinit config into
-    /etc/cloud/cloud.cfg.d/90_datasource.cfg."""
-    path = os.path.join(
-        target, 'etc', 'cloud', 'cloud.cfg.d', '90_datasource.cfg')
-    with open(path, 'w') as stream:
-        stream.write(data + '\n')
-
-
-def main():
-    # The builtin Curtin hooks handle writing the datasource as
-    # 50-cloudconfig-maas-reporting.cfg. Running this creates duplicated data
-    # at 90_datasource.cfg.
-    if 'CENTOS_CURTHOOK_SUPPORT' in curtin_features:
-        return
-    state = util.load_command_environment()
-    target = state['target']
-    if target is None:
-        print("Target was not provided in the environment.")
-        sys.exit(1)
-    config_f = state['config']
-    if config_f is None:
-        print("Config was not provided in the environment.")
-        sys.exit(1)
-    config = load_config(config_f)
-
-    debconf = get_maas_debconf_selections(config)
-    if debconf is None:
-        print("Failed to get the debconf_selections.")
-        sys.exit(1)
-
-    params = extract_maas_parameters(debconf)
-    datasource = get_datasource(**params)
-    write_datasource(target, datasource)
-
-
-if __name__ == "__main__":
-    main()

=== removed file 'curtin/centos7/python_wrapper'
--- curtin/centos7/python_wrapper	2016-05-11 18:47:46 +0000
+++ curtin/centos7/python_wrapper	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-export PYTHONPATH='/curtin'
-
-# Ubuntu 16.04 only ships with Python 3 while previous versions only ship
-# with Python 2.
-if type -p python > /dev/null; then
-    exec python "$0.py" "$@"
-else
-    exec python3 "$0.py" "$@"
-fi

=== removed directory 'exdata'
=== removed file 'exdata/README'
--- exdata/README	2014-03-07 22:06:52 +0000
+++ exdata/README	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-each directory under here is a disjoint source/site.
- * muc/ (maas.ubuntu.com)
- * hcc/ (hyperscale.canonica.com)
-
-files in those directories are products.
-they contain the same basic layout as a product_id in a content_id.
-
-The intent is to build a tool that can do this:
-
- * mk-exdata --output=muc-output/ --content-id=maas.ubuntu.com:boot \
-     muc/precise-*
-   this would create a index.json in muc-output with valid stream.
-   it would just create the files and insert checksums and sizes.
-
-   Other parameters would be '--as-of-date=20140213' to only produce
-   output as of that date, and '--max=3' to limit the output to only
-   the latest 3 in each entry.
-
-   mk-exdata would fill in the paths per the '_path'.

=== removed file 'exdata/dates.txt'
--- exdata/dates.txt	2014-03-07 22:06:52 +0000
+++ exdata/dates.txt	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-20120426: 12.04    precise
-20120824: 12.04.1  precise-polish
-20121018: 12.10    quantal
-20130214: 12.04.2  precise-hwe-q
-20130425: 13.04    raring
-20130823: 12.04.3  precise-hwe-r
-20131017: 13.10    saucy
-20140206: 12.04.4  precise-hwe-s
-20140417: 14.04    trusty
-20140828: 12.04.5  precise-hwe-t

=== removed directory 'exdata/hcc'
=== removed file 'exdata/hcc/info.txt'
--- exdata/hcc/info.txt	2014-03-07 22:06:52 +0000
+++ exdata/hcc/info.txt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-# this would be example data that would appear on hyperscale.canonical.com

=== removed directory 'exdata/muc'
=== removed file 'exdata/muc/precise-armhf-p.yaml'
--- exdata/muc/precise-armhf-p.yaml	2014-03-07 22:06:52 +0000
+++ exdata/muc/precise-armhf-p.yaml	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-"com.ubuntu.maas:boot:12.04:armhf":
-  _path: "%(release)s/%(arch)s/hwe-p/%(version_id)s/%(item_id)s"
-  release: "precise"
-  version: "12.04"
-  arch: "armhf"
-  subarches: "generic,hwe-p"
-  versions:
-    "20120426":
-       items:
-         boot-kernel: {}
-         boot-initrd: {}
-         di-kernel: {}
-         di-initrd: {}
-         root-image:
-           path: "%(release)s/%(arch)s/20120425/root-image"
-    "20120824":
-       items:
-         boot-kernel: {}
-         boot-initrd: {}
-         di-kernel: {}
-         di-initrd: {}
-         root-image:
-           path: "%(release)s/%(arch)s/20120823/root-image"
-    "20130214":
-       items:
-         boot-kernel: {}
-         boot-initrd: {}
-         di-kernel: {}
-         di-initrd: {}
-         root-image:
-           path: "%(release)s/%(arch)s/20130213/root-image"
-    "20130823":
-       items:
-         boot-kernel: {}
-         boot-initrd: {}
-         di-kernel: {}
-         di-initrd: {}
-         root-image:
-           path: "%(release)s/%(arch)s/20130822/root-image"
-    "20140206":
-       items:
-         boot-kernel: {}
-         boot-initrd: {}
-         di-kernel: {}
-         di-initrd: {}