Merge lp:~smoser/maas-images/trunk.lp1688606-add-rooturl into lp:maas-images

[Scott Moser]

bin/kpack-from-image: install rooturl if not already installed.

This modifies the build of the initramfs so that they include
cloud-initramfs-rooturl. It will fail if that package is not available.

cloud-initramfs-rooturl is marked for SRU to current releases under
bug 1688606.

The code will install the package in precise if it is available but
not fail if not available. On other releases that is fatal.

[Scott Moser (smoser)]

This should be good to merge as soon as bug 1688606 lets the rooturl package into the archive for each supported release.

[Blake Rouse (blake-rouse)]

Looks good. Any timeline on precise? Or what did we decide to do with precise?

review: Approve

[Scott Moser (smoser)]

I believe we decided not to do precise.
Users who want to use precise will need to do so with an older MAAS.

That could change, but it would then require SRU to precise of that package also.

=== modified file 'bin/kpack-from-image'
--- bin/kpack-from-image	2017-05-05 16:17:17 +0000
+++ bin/kpack-from-image	2017-05-11 14:49:35 +0000
@@ -289,11 +289,30 @@
 
     copymods="cloud-initramfs-copymods"
     if [ -f /usr/share/initramfs-tools/hooks/copymods ]; then
-        error "$copymods already installed"
-        copymods=""
+        debug 1 "package '$copymods' already installed."
     else
         apt-cache show $copymods >/dev/null 2>&1 ||
-            { error "copymods not available"; return 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
@@ -322,9 +341,9 @@
     vrun 1 "installing packages" \
         env DEBIAN_FRONTEND=noninteractive FLASH_KERNEL_SKIP=1 \
         $emd apt-get install --assume-yes --quiet \
-            $copymods "${pkgs[@]}" </dev/null
+            "${pkgs[@]}" </dev/null
     [ $? -eq 0 ] ||
-        { error "failed install of $copymods ${pkgs[*]}"; return 1; }
+        { error "failed install of ${pkgs[*]}"; return 1; }
 
     undisable_services / ||
         { error "failed to re-enable services after apt installs"; return 1; }