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

[Scott Moser]

maas-cloudimg2eph2: repack squash if additional archives are used.

If --proposed or M2E_ADD_REPOS or M2E_ADD_PACKAGES are set, then that
means we should re-pack squashfs.

This check is not perfect at all, as other things might cause that, but
it is required to get a new squashfs created for the path already in
existance.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

=== modified file 'bin/maas-cloudimg2eph2'
--- bin/maas-cloudimg2eph2	2016-10-06 13:03:32 +0000
+++ bin/maas-cloudimg2eph2	2017-10-06 20:54:19 +0000
@@ -640,7 +640,11 @@
     if [ "$fmt" = "squashfs-image" ]; then
         local squash_out=""
         squash_out=$(dirname "$output")/$(basename "$src")
-        if [ -n "${proposed_flag}" ]; then
+
+        # 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.$$"