move includes around for move of live-server to layers

4 years ago · e06046aaa0
parent f563b310d3
commit e06046aaa0
22 changed files with 4 additions and 1 deletions
--- a/live-build/ubuntu-server/includes.binary/boot/.keep
+++ b/live-build/ubuntu-server/includes.binary/boot/.keep
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/etc/cloud/cloud.cfg
+++ b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/etc/cloud/cloud.cfg
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/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
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/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
--- 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
@ -0,0 +1,3 @@
+[Unit]
+JobRunningTimeoutSec=0s
+Wants=subiquity_config.mount
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/bin/subiquity-shell
+++ b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/bin/subiquity-shell
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/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
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/getty@tty1.service
+++ b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/getty@tty1.service
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/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
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/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
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/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
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/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
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/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
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/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
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/subiquity_config.mount
+++ b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/subiquity_config.mount
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/systemd-networkd-wait-online
+++ b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/systemd-networkd-wait-online
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/var/lib/cloud/seed/nocloud/meta-data
+++ b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/var/lib/cloud/seed/nocloud/meta-data
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/var/lib/cloud/seed/nocloud/user-data
+++ b/live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/var/lib/cloud/seed/nocloud/user-data
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server/etc/hosts
+++ b/live-build/ubuntu-server/includes.chroot.ubuntu-server/etc/hosts
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server/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
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server/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
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server/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