diff --git a/debian/changelog b/debian/changelog index 3ca4212f..8dac96e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.546) 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. + * Move overlay include.binary /lib to /usr/lib. + + -- 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 diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/getty@.service.d/autologin.conf b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/getty@.service.d/autologin.conf similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/getty@.service.d/autologin.conf rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/getty@.service.d/autologin.conf diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/getty@tty1.service.d/conditional.conf b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/getty@tty1.service.d/conditional.conf similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/getty@tty1.service.d/conditional.conf rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/getty@tty1.service.d/conditional.conf diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-filesystem.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-filesystem.mount similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-filesystem.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-filesystem.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-rack.lower.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-rack.lower.mount similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-rack.lower.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-rack.lower.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-rack.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-rack.mount similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-rack.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-rack.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-region.lower.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-region.lower.mount similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-region.lower.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-region.lower.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-region.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-region.mount similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/media-region.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-region.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/subiquity_config.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/subiquity_config.mount similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/subiquity_config.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/subiquity_config.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-filesystem.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-filesystem.mount similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-filesystem.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-filesystem.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-rack.lower.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-rack.lower.mount similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-rack.lower.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-rack.lower.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-rack.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-rack.mount similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-rack.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-rack.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-region.lower.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-region.lower.mount similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-region.lower.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-region.lower.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-region.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-region.mount similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/media-region.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-region.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-subiquity@.service similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/serial-subiquity@.service rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-subiquity@.service diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snapd.service.d/no-reexec.conf b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snapd.service.d/no-reexec.conf similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/snapd.service.d/no-reexec.conf rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snapd.service.d/no-reexec.conf diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity_config.mount b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/subiquity_config.mount similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity_config.mount rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/subiquity_config.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/systemd-networkd-wait-online b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/systemd-networkd-wait-online similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/lib/systemd/systemd-networkd-wait-online rename to live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/systemd-networkd-wait-online