Imported 2.546

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,12 @@
+livecd-rootfs (2.546) disco; urgency=medium
+
+  * Revert "Do not mount result, on top of lowerdir, appears to fail in
+    disco." the actual problem is in live-build with merged-usr and
+    copying over chroot/binary includes.
+  * Move overlay include.binary /lib to /usr/lib.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 12 Nov 2018 20:37:51 +0000
+
 livecd-rootfs (2.545) disco; urgency=medium
 
   [ Dimitri John Ledkov ]

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

@@ -24,17 +24,15 @@ fi
 . config/functions
 . config/common
 
-BOTTOM_ROOT=binary/boot/squashfs.dir
-SQUASH_ROOT=binary/boot/squashfs-installer.dir
-OVERLAY_ROOT=binary/overlay-installer
+SQUASH_ROOT=binary/boot/squashfs.dir
+OVERLAY_ROOT=binary/overlay
 
-mkdir -p "$SQUASH_ROOT"
 mkdir -p "$OVERLAY_ROOT"
 
 # Create an installer squashfs layer
-mount_overlay "$BOTTOM_ROOT/" "$OVERLAY_ROOT/" "$SQUASH_ROOT/"
+mount_overlay "$SQUASH_ROOT/" "$OVERLAY_ROOT/" "$SQUASH_ROOT/"
 
-setup_mountpoint $SQUASH_ROOT
+setup_mountpoint binary/boot/squashfs.dir
 
 # Override JobRunningTimeoutSec to 0s on the .device unit that
 # subiquity_config.mount depends on to avoid a 5s delay on switching