Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-16 05:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
disco." the actual problem is in live-build with merged-usr and
copying over chroot/binary includes.
This commit is contained in:
Dimitri John Ledkov 2018-11-12 20:39:25 +00:00
parent 9a8d7117e3
commit 93df6705a0
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -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 <xnox@ubuntu.com> Mon, 12 Nov 2018 20:37:51 +0000
livecd-rootfs (2.545) disco; urgency=medium livecd-rootfs (2.545) disco; urgency=medium
[ Dimitri John Ledkov ] [ Dimitri John Ledkov ]

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

@ -24,17 +24,15 @@ fi
. config/functions . config/functions
. config/common . config/common
BOTTOM_ROOT=binary/boot/squashfs.dir SQUASH_ROOT=binary/boot/squashfs.dir
SQUASH_ROOT=binary/boot/squashfs-installer.dir OVERLAY_ROOT=binary/overlay
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 "$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 # 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