Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-06-17 13:12:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not mount result, on top of lowerdir, appears to fail in

Browse Source 
disco. Should unblock building server-live images in disco.
This commit is contained in:
Dimitri John Ledkov 2018-11-09 22:15:02 +00:00
commit a5a7a0be8d
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -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 <xnox@ubuntu.com> Fri, 09 Nov 2018 22:13:49 +0000
livecd-rootfs (2.544) disco; urgency=medium livecd-rootfs (2.544) disco; urgency=medium
[ Steve Langasek ] [ Steve Langasek ]

4
live-build/ubuntu-server/hooks/031-maas-squashfs.binary
View File

@ -40,7 +40,7 @@ mkdir -p "$OVERLAY_REGION_ROOT"
# RACK is on top of the regular squashfs # 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 setup_mountpoint $RACK_ROOT
env DEBIAN_FRONTEND=noninteractive chroot $RACK_ROOT apt-get -y install maas-rack-controller 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 # Full MAAS (Region) is on top of the rack
# in overlayfs lowerdir are mounted right to left, colon separated # 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 setup_mountpoint $REGION_ROOT

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

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