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

add a minimal server layer under the full server layer

Browse Source
This commit is contained in:
Michael Hudson-Doyle 2021-07-19 16:24:07 +12:00
parent 1e24a44866
commit d11c71a686
27 changed files with 26 additions and 16 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.733) UNRELEASED; urgency=medium
* Add a minimal server layer underneath the full server layer. Continue to
mount the full server layer at /media/filesystem for now to keep
compatibility with current subiquity.
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Tue, 03 Aug 2021 16:34:57 +1200
livecd-rootfs (2.732) impish; urgency=medium livecd-rootfs (2.732) impish; urgency=medium
[ Michael Hudson-Doyle ] [ Michael Hudson-Doyle ]

18
live-build/auto/config
View File

@ -773,15 +773,17 @@ case $PROJECT in
case ${SUBPROJECT:-} in case ${SUBPROJECT:-} in
live) live)
PASSES_TO_LAYERS=true PASSES_TO_LAYERS=true
add_task ubuntu-server minimal standard server add_task ubuntu-server-minimal server-minimal
add_package ubuntu-server-minimal lxd-installer
add_task ubuntu-server-minimal.ubuntu-server minimal standard server
# add_task really should do this itself but for now... # add_task really should do this itself but for now...
snap_from_seed server config/package-lists/livecd-rootfs.snaplist.chroot_ubuntu-server.full snap_from_seed server config/package-lists/livecd-rootfs.snaplist.chroot_ubuntu-server-minimal.ubuntu-server.full
add_package ubuntu-server cloud-init add_package ubuntu-server-minimal.ubuntu-server cloud-init
add_package ubuntu-server.installer linux-firmware lupin-casper openssh-server add_package ubuntu-server-minimal.ubuntu-server.installer linux-firmware lupin-casper openssh-server
add_snap ubuntu-server.installer subiquity/classic add_snap ubuntu-server-minimal.ubuntu-server.installer subiquity/classic
if [ $ARCH = s390x ]; then if [ $ARCH = s390x ]; then
add_package ubuntu-server.installer s390-tools-zkey add_package ubuntu-server-minimal.ubuntu-server.installer s390-tools-zkey
fi fi
# Live server ISOs for LTS point releases past .2 offer both # Live server ISOs for LTS point releases past .2 offer both
@ -804,8 +806,8 @@ case $PROJECT in
exit 1 exit 1
fi fi
add_package ubuntu-server.installer.$flavor $kernel_metapkg add_package ubuntu-server-minimal.ubuntu-server.installer.$flavor $kernel_metapkg
LIVE_PASSES="${LIVE_PASSES:+$LIVE_PASSES }ubuntu-server.installer.$flavor" LIVE_PASSES="${LIVE_PASSES:+$LIVE_PASSES }ubuntu-server-minimal.ubuntu-server.installer.$flavor"
done done
;; ;;
*) *)

2
live-build/ubuntu-server/hooks/02-installer-bits.chroot
View File

@ -1,7 +1,7 @@
#!/bin/bash -ex #!/bin/bash -ex
# vi: ts=4 noexpandtab # vi: ts=4 noexpandtab
if [ "${PASS}" != "ubuntu-server.installer" ]; then if [ "${PASS}" != "ubuntu-server-minimal.ubuntu-server.installer" ]; then
exit 0 exit 0
fi fi

2
live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early
View File

@ -2,7 +2,7 @@
# vi: ts=4 noexpandtab # vi: ts=4 noexpandtab
case $PASS in case $PASS in
ubuntu-server.installer.*) ubuntu-server-minimal.ubuntu-server.installer.*)
flavor=${PASS##*.} flavor=${PASS##*.}
if [ "$flavor" = "generic" ]; then if [ "$flavor" = "generic" ]; then
kernel_metapkg=linux-generic kernel_metapkg=linux-generic

2
live-build/ubuntu-server/hooks/04-kernel-bits.binary
View File

@ -2,7 +2,7 @@
# vi: ts=4 noexpandtab # vi: ts=4 noexpandtab
case $PASS in case $PASS in
ubuntu-server.installer.*) ubuntu-server-minimal.ubuntu-server.installer.*)
flavor=${PASS##*.} flavor=${PASS##*.}
;; ;;
*) *)

0
live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/etc/cloud/cloud.cfg → live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/cloud/cloud.cfg
View File

0
live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/etc/cloud/cloud.cfg.d/06_quiet.cfg → live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/cloud/cloud.cfg.d/06_quiet.cfg
View File

0
live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/etc/systemd/journald.conf.d/no-rate-limit.conf → live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/systemd/journald.conf.d/no-rate-limit.conf
View File

0
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 → live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/systemd/system/dev-disk-by\x2duuid-00c629d6\x2d06ab\x2d4dfd\x2db21e\x2dc3186f34105d.device.d/override.conf
View File

0
live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/bin/subiquity-shell → live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/bin/subiquity-shell
View File

0
live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/getty@.service.d/autologin.conf → live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/getty@.service.d/autologin.conf
View File

0
live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/getty@tty1.service → live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/getty@tty1.service
View File

0
live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/local-fs.target.wants/media-filesystem.mount → live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/local-fs.target.wants/media-filesystem.mount
View File

5
live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/media-filesystem.mount Normal file
View File

@ -0,0 +1,5 @@
[Mount]
What=/cdrom/casper/ubuntu-server-minimal.ubuntu-server.squashfs
Where=/media/filesystem
Type=squashfs
Options=ro

0
live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf → live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf
View File

0
live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/serial-getty@sclp_line0.service.d/subiquity-serial.conf → live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/serial-getty@sclp_line0.service.d/subiquity-serial.conf
View File

0
live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf → live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf
View File

0
live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/snapd.service.d/no-reexec.conf → live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/snapd.service.d/no-reexec.conf
View File

0
live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/subiquity_config.mount → live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/subiquity_config.mount
View File

0
live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/systemd-networkd-wait-online → live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/systemd-networkd-wait-online
View File

0
live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/var/lib/cloud/seed/nocloud/meta-data → live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/var/lib/cloud/seed/nocloud/meta-data
View File

0
live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/var/lib/cloud/seed/nocloud/user-data → live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/var/lib/cloud/seed/nocloud/user-data
View File

0
live-build/ubuntu-server/includes.chroot.ubuntu-server/etc/hosts → live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal/etc/hosts
View File

0
live-build/ubuntu-server/includes.chroot.ubuntu-server/etc/systemd/system/multi-user.target.wants/systemd-networkd.service → live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
View File

0
live-build/ubuntu-server/includes.chroot.ubuntu-server/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service → live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service
View File

0
live-build/ubuntu-server/includes.chroot.ubuntu-server/etc/systemd/system/sockets.target.wants/systemd-networkd.socket → live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal/etc/systemd/system/sockets.target.wants/systemd-networkd.socket
View File

5
live-build/ubuntu-server/includes.chroot.ubuntu-server.installer/usr/lib/systemd/system/media-filesystem.mount
View File

@ -1,5 +0,0 @@
[Mount]
What=/cdrom/casper/ubuntu-server.squashfs
Where=/media/filesystem
Type=squashfs
Options=ro