From 93df6705a04f62a945edd42d526e1257066a2f16 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Mon, 12 Nov 2018 20:39:25 +0000 Subject: [PATCH] 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. --- debian/changelog | 8 ++++++++ .../ubuntu-server/hooks/032-installer-squashfs.binary | 10 ++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3ca4212f..ff8332ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.546~ppa1) 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. + + -- Dimitri John Ledkov Mon, 12 Nov 2018 20:37:51 +0000 + livecd-rootfs (2.545) disco; urgency=medium [ Dimitri John Ledkov ] diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary index b464f1f2..bab6ab76 100755 --- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary +++ b/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