From 1b424926db9fa15a91255553f7491312f9788a73 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Thu, 8 Nov 2018 14:54:20 +0000 Subject: [PATCH] Do not mount result, on top of lowerdir, appears to fail in disco. --- .../ubuntu-server/hooks/032-installer-squashfs.binary | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary index bab6ab76..b464f1f2 100755 --- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary +++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary @@ -24,15 +24,17 @@ fi . config/functions . config/common -SQUASH_ROOT=binary/boot/squashfs.dir -OVERLAY_ROOT=binary/overlay +BOTTOM_ROOT=binary/boot/squashfs.dir +SQUASH_ROOT=binary/boot/squashfs-installer.dir +OVERLAY_ROOT=binary/overlay-installer +mkdir -p "$SQUASH_ROOT" mkdir -p "$OVERLAY_ROOT" # Create an installer squashfs layer -mount_overlay "$SQUASH_ROOT/" "$OVERLAY_ROOT/" "$SQUASH_ROOT/" +mount_overlay "$BOTTOM_ROOT/" "$OVERLAY_ROOT/" "$SQUASH_ROOT/" -setup_mountpoint binary/boot/squashfs.dir +setup_mountpoint $SQUASH_ROOT # Override JobRunningTimeoutSec to 0s on the .device unit that # subiquity_config.mount depends on to avoid a 5s delay on switching