diff --git a/live-build/ubuntu-server/includes.binary/boot/.keep b/live-build/ubuntu-server/includes.binary/boot/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/live-build/ubuntu-server/includes.binary/overlay/etc/cloud/cloud.cfg b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/etc/cloud/cloud.cfg similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/etc/cloud/cloud.cfg rename to live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/etc/cloud/cloud.cfg diff --git a/live-build/ubuntu-server/includes.binary/overlay/etc/cloud/cloud.cfg.d/06_quiet.cfg b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/etc/cloud/cloud.cfg.d/06_quiet.cfg similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/etc/cloud/cloud.cfg.d/06_quiet.cfg rename to live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/etc/cloud/cloud.cfg.d/06_quiet.cfg diff --git a/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/etc/systemd/journald.conf.d/no-rate-limit.conf similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf rename to live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/etc/systemd/journald.conf.d/no-rate-limit.conf diff --git "a/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/etc/systemd/system/dev-disk-by\\x2duuid-00c629d6\\x2d06ab\\x2d4dfd\\x2db21e\\x2dc3186f34105d.device.d/override.conf" "b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/etc/systemd/system/dev-disk-by\\x2duuid-00c629d6\\x2d06ab\\x2d4dfd\\x2db21e\\x2dc3186f34105d.device.d/override.conf" new file mode 100644 index 00000000..90ac2590 --- /dev/null +++ "b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/etc/systemd/system/dev-disk-by\\x2duuid-00c629d6\\x2d06ab\\x2d4dfd\\x2db21e\\x2dc3186f34105d.device.d/override.conf" @@ -0,0 +1,3 @@ +[Unit] +JobRunningTimeoutSec=0s +Wants=subiquity_config.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/bin/subiquity-shell b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/bin/subiquity-shell similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/usr/bin/subiquity-shell rename to live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/bin/subiquity-shell diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/getty@.service.d/autologin.conf b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/getty@.service.d/autologin.conf similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/getty@.service.d/autologin.conf rename to live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/getty@.service.d/autologin.conf diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/getty@tty1.service b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/getty@tty1.service similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/getty@tty1.service rename to live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/getty@tty1.service diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-filesystem.mount b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/local-fs.target.wants/media-filesystem.mount similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/local-fs.target.wants/media-filesystem.mount rename to live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/local-fs.target.wants/media-filesystem.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-filesystem.mount b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/media-filesystem.mount similarity index 57% rename from live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-filesystem.mount rename to live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/media-filesystem.mount index 13fe2e1f..60a07210 100644 --- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/media-filesystem.mount +++ b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/media-filesystem.mount @@ -1,5 +1,5 @@ [Mount] -What=/cdrom/casper/filesystem.squashfs +What=/cdrom/casper/ubuntu-server.squashfs Where=/media/filesystem Type=squashfs Options=ro diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf rename to live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-getty@sclp_line0.service.d/subiquity-serial.conf b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/serial-getty@sclp_line0.service.d/subiquity-serial.conf similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-getty@sclp_line0.service.d/subiquity-serial.conf rename to live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/serial-getty@sclp_line0.service.d/subiquity-serial.conf diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf rename to live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snapd.service.d/no-reexec.conf b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/snapd.service.d/no-reexec.conf similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snapd.service.d/no-reexec.conf rename to live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/snapd.service.d/no-reexec.conf diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/subiquity_config.mount b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/subiquity_config.mount similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/subiquity_config.mount rename to live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/subiquity_config.mount diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/systemd-networkd-wait-online b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/systemd-networkd-wait-online similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/systemd-networkd-wait-online rename to live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/systemd-networkd-wait-online diff --git a/live-build/ubuntu-server/includes.binary/overlay/var/lib/cloud/seed/nocloud/meta-data b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/var/lib/cloud/seed/nocloud/meta-data similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/var/lib/cloud/seed/nocloud/meta-data rename to live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/var/lib/cloud/seed/nocloud/meta-data diff --git a/live-build/ubuntu-server/includes.binary/overlay/var/lib/cloud/seed/nocloud/user-data b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/var/lib/cloud/seed/nocloud/user-data similarity index 100% rename from live-build/ubuntu-server/includes.binary/overlay/var/lib/cloud/seed/nocloud/user-data rename to live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/var/lib/cloud/seed/nocloud/user-data diff --git a/live-build/ubuntu-server/includes.chroot/etc/hosts b/live-build/ubuntu-server/includes.chroot.ubuntu-server/etc/hosts similarity index 100% rename from live-build/ubuntu-server/includes.chroot/etc/hosts rename to live-build/ubuntu-server/includes.chroot.ubuntu-server/etc/hosts diff --git a/live-build/ubuntu-server/includes.chroot/etc/systemd/system/multi-user.target.wants/systemd-networkd.service b/live-build/ubuntu-server/includes.chroot.ubuntu-server/etc/systemd/system/multi-user.target.wants/systemd-networkd.service similarity index 100% rename from live-build/ubuntu-server/includes.chroot/etc/systemd/system/multi-user.target.wants/systemd-networkd.service rename to live-build/ubuntu-server/includes.chroot.ubuntu-server/etc/systemd/system/multi-user.target.wants/systemd-networkd.service diff --git a/live-build/ubuntu-server/includes.chroot/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service b/live-build/ubuntu-server/includes.chroot.ubuntu-server/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service similarity index 100% rename from live-build/ubuntu-server/includes.chroot/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service rename to live-build/ubuntu-server/includes.chroot.ubuntu-server/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service diff --git a/live-build/ubuntu-server/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket b/live-build/ubuntu-server/includes.chroot.ubuntu-server/etc/systemd/system/sockets.target.wants/systemd-networkd.socket similarity index 100% rename from live-build/ubuntu-server/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket rename to live-build/ubuntu-server/includes.chroot.ubuntu-server/etc/systemd/system/sockets.target.wants/systemd-networkd.socket