Imported 2.643

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,12 @@
+livecd-rootfs (2.643) focal; urgency=medium
+
+  * subiquity:
+    - drop ds-identify policy, not needed with improved cloud config
+    - drop disabling network, doesn't work with ip=
+    - fixup setting up the INSTALLER_ROOT mountpoint
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 10 Feb 2020 23:50:16 +0000
+
 livecd-rootfs (2.642) focal; urgency=medium
 
   * Set uc20 image size to 10G.

live-build/ubuntu-server/hooks/032-installer-squashfs.binary

@@ -35,7 +35,7 @@ mkdir -p "$INSTALLER_ROOT" "$OVERLAY_ROOT"
 # Create an installer squashfs layer
 mount_overlay "$FILESYSTEM_ROOT/" "$OVERLAY_ROOT/" "$INSTALLER_ROOT/"
 
-setup_mountpoint binary/boot/squashfs.dir
+setup_mountpoint "$INSTALLER_ROOT"
 
 # Override JobRunningTimeoutSec to 0s on the .device unit that
 # subiquity_config.mount depends on to avoid a 5s delay on switching

live-build/ubuntu-server/includes.binary/overlay/etc/cloud/cloud.cfg

@@ -23,9 +23,6 @@ chpasswd:
 # This is the initial network config.
 # It can be overwritten by cloud-init or subiquity.
 network:
-    ## until https://bugs.launchpad.net/cloud-init/+bug/1861460 is fixed
-    config: disabled
-    ##
     version: 2
     ethernets:
         all-en:

live-build/ubuntu-server/includes.binary/overlay/etc/cloud/ds-identify.cfg

@@ -1,2 +0,0 @@
-policy: search,found=first,maybe=none,notfound=enabled
-datasource: None