From e24dccadcc06c2d028e72e0f65b416eb52bdb16a Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Thu, 8 Nov 2018 14:53:43 +0000 Subject: [PATCH 1/3] mount_overlay only takes 3 args --- live-build/ubuntu-server/hooks/031-maas-squashfs.binary | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/live-build/ubuntu-server/hooks/031-maas-squashfs.binary b/live-build/ubuntu-server/hooks/031-maas-squashfs.binary index ba348ba3..edbd20ba 100755 --- a/live-build/ubuntu-server/hooks/031-maas-squashfs.binary +++ b/live-build/ubuntu-server/hooks/031-maas-squashfs.binary @@ -40,7 +40,7 @@ mkdir -p "$OVERLAY_REGION_ROOT" # RACK is on top of the regular squashfs -mount_overlay "$SQUASH_ROOT/" "$OVERLAY_RACK_ROOT/" "$RACK_ROOT/" "RACK" +mount_overlay "$SQUASH_ROOT/" "$OVERLAY_RACK_ROOT/" "$RACK_ROOT/" setup_mountpoint $RACK_ROOT env DEBIAN_FRONTEND=noninteractive chroot $RACK_ROOT apt-get -y install maas-rack-controller @@ -54,7 +54,7 @@ umount "$RACK_ROOT" # Full MAAS (Region) is on top of the rack # in overlayfs lowerdir are mounted right to left, colon separated -mount_overlay "$OVERLAY_RACK_ROOT/:$SQUASH_ROOT/" "$OVERLAY_REGION_ROOT/" "$REGION_ROOT/" "REGION" +mount_overlay "$OVERLAY_RACK_ROOT/:$SQUASH_ROOT/" "$OVERLAY_REGION_ROOT/" "$REGION_ROOT/" setup_mountpoint $REGION_ROOT From 1b424926db9fa15a91255553f7491312f9788a73 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Thu, 8 Nov 2018 14:54:20 +0000 Subject: [PATCH 2/3] 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 From 6ad590157a1a445961c272fc782eb654ed7d0476 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Fri, 9 Nov 2018 22:14:26 +0000 Subject: [PATCH 3/3] Do not mount result, on top of lowerdir, appears to fail in disco. Should unblock building server-live images in disco. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index b84a17fb..ed1038ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.545) UNRELEASED; urgency=medium + + * Do not mount result, on top of lowerdir, appears to fail in + disco. Should unblock building server-live images in disco. + + -- Dimitri John Ledkov Fri, 09 Nov 2018 22:13:49 +0000 + livecd-rootfs (2.544) disco; urgency=medium [ Steve Langasek ]