Merge lp:~smoser/maas-images/trunk.dyn-netconf-krd-only into lp:maas-images

[Scott Moser]

Add cloud-initramfs-dyn-netconf in initramfs generation.

The package cloud-initramfs-dyn-netconf is not needed inside the image.
For releases less than bionic, leave it there. In those releases it
was either always installed (xenial) or installed via the ubuntu-server
meta-package.

For bionic, it is not needed in the image, and was removed from the
ubuntu-server seed and meta-package.

Thus, for bionic, we have to add it in the initramfs generation.
The mechanism for doing so that is added ensures it is added if not
present.

[lp:~smoser/maas-images/trunk.dyn-netconf-krd-only]

393. By Scott Moser on 2018-02-12

Add cloud-initramfs-dyn-netconf in initramfs generation.

The package cloud-initramfs-dyn-netconf is not needed inside the image.
For releases less than bionic, leave it there. In those releases it
was either always installed (xenial) or installed via the ubuntu-server
meta-package.

For bionic, it is not needed in the image, and was removed from the
ubuntu-server seed and meta-package.

Thus, for bionic, we have to add it in the initramfs generation.
The mechanism for doing so that is added ensures it is added if not
present.

This change is actually not meaningful if the squashfs image is
the one used in publication (maas v3 streams). But is meaningful
for v2 streams, where the maas-image build process produces
the root-image.gz.

394. By Scott Moser on 2018-02-13

much simpler installation of required packages.

Just let apt figure it out.

[Scott Moser (smoser)]

The first hunk of this (cloud-initramfs-dyn-netconf added)
got fixed under revno 392 (fdebb643909b4dc8d62453ce657f2705a038b29d).

The remaining chunk is a simplification for sure. but Im' not going to push on that now.

Unmerged revisions

394. By Scott Moser on 2018-02-13

much simpler installation of required packages.

Just let apt figure it out.

393. By Scott Moser on 2018-02-12

Add cloud-initramfs-dyn-netconf in initramfs generation.

The package cloud-initramfs-dyn-netconf is not needed inside the image.
For releases less than bionic, leave it there. In those releases it
was either always installed (xenial) or installed via the ubuntu-server
meta-package.

For bionic, it is not needed in the image, and was removed from the
ubuntu-server seed and meta-package.

Thus, for bionic, we have to add it in the initramfs generation.
The mechanism for doing so that is added ensures it is added if not
present.

This change is actually not meaningful if the squashfs image is
the one used in publication (maas v3 streams). But is meaningful
for v2 streams, where the maas-image build process produces
the root-image.gz.

=== modified file 'bin/kpack-from-image'
--- bin/kpack-from-image	2018-01-06 02:12:26 +0000
+++ bin/kpack-from-image	2018-02-13 18:21:38 +0000
@@ -307,43 +307,19 @@
             { 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
+    local reqpkgs=""
+    reqpkgs=(
+        lvm2                         # LP: #1519470
+        mvadm                        # LP: #1519470
+        cloud-initramfs-copymods
+        cloud-initramfs-rooturl      # LP: #1688606
+        cloud-initramfs-dyn-netconf  # LP: #1749019
+        # rooturl is not available in precise.
+        $( [ "$rel" != "precise" ] && echo cloud-initramfs-rooturl )
+    )
 
     zzgrub=/etc/kernel/postinst.d/zz-update-grub
     [ ! -x "$zzgrub" ] || chmod ugo-x $zzgrub
@@ -374,7 +350,7 @@
     vrun 1 "installing packages" \
         env DEBIAN_FRONTEND=noninteractive FLASH_KERNEL_SKIP=1 \
         $emd apt-get install --assume-yes --quiet \
-            "${pkgs[@]}" </dev/null
+            "${pkgs[@]}" "${reqpkgs[@]}" </dev/null
     [ $? -eq 0 ] ||
         { error "failed install of ${pkgs[*]}"; return 1; }
 

=== modified file 'bin/maas-cloudimg2ephemeral'
--- bin/maas-cloudimg2ephemeral	2018-02-12 22:10:35 +0000
+++ bin/maas-cloudimg2ephemeral	2018-02-13 18:21:38 +0000
@@ -347,8 +347,14 @@
     fi
 
     # additional packages that we have to add
-    add_pkgs="cloud-initramfs-dyn-netconf"  # LP: #1749019
-    add_pkgs="${add_pkgs} open-iscsi overlayroot"
+    add_pkgs="open-iscsi overlayroot"
+    case "$release" in
+        precise|trusty|xenial|artful)
+            # initrd still adds cloud-initramfs-dyn-netconf. But not needed
+            # in the root image (LP: 1749019).
+            add_pkgs="${add_pkgs} cloud-initramfs-dyn-netconf";;
+    esac
+
     if [ -n "${add_packages}" ]; then
         debug 1 "add_packages=$add_packages (from M2E_ADD_PACKAGES)"
         add_pkgs="${add_pkgs} ${add_packages}"