[Merge] ~dbungert/livecd-rootfs:cloud-init-and-u-d-i into livecd-rootfs:ubuntu/master

[Chad Smith]

Review: Approve

I approve the content as-is. If you decide it may be worth the extra warning/breadcrumb in /etc/cloud/clean.d. Just add a commit here and I'll review again.


Here's a supplemental diff or your branch if you want

diff --git a/live-build/functions b/live-build/functions
index 0d5c8372..bacf13f9 100644
--- a/live-build/functions
+++ b/live-build/functions
@@ -999,6 +999,17 @@ system_info:
     renderers: ['network-manager']
     activators: ['network-manager']
 EOF
+
+        # Allow cloud-init clean to inform of strict network-manager config
+        mkdir -p chroot/etc/cloud/clean.d
+        cat <<EOF > chroot/etc/cloud/clean.d/99-ubuntu-desktop-installer
+# Inform clone image creators about strict network-manager cfg for cloud-init
+if [ -f /etc/cloud/clean.d/99-ubuntu-desktop-installer ]; then
+  echo "WARNING: cloud-init network config is limited to using network-manager."
+  echo "If this is undesirable: rm /etc/cloud/clean.d/99-ubuntu-desktop-installer"
+fi
+EOF
+       chmod +x chroot/etc/cloud/clean.d/99-ubuntu-desktop-installer
     else
         echo "==== NetworkManager not installed ===="
     fi

-- 
https://code.launchpad.net/~dbungert/livecd-rootfs/+git/livecd-rootfs/+merge/427445
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~dbungert/livecd-rootfs:cloud-init-and-u-d-i into livecd-rootfs:ubuntu/master.