diff --git a/debian/changelog b/debian/changelog index 4e464bd0..a9ce8096 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.734) UNRELEASED; urgency=medium + + * Create source catalogs for the installable live server layers. + + -- Michael Hudson-Doyle Tue, 03 Aug 2021 16:34:57 +1200 + livecd-rootfs (2.733) impish; urgency=medium [ Michael Hudson-Doyle ] diff --git a/live-build/auto/config b/live-build/auto/config index 45bf095d..32cebd0b 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -810,6 +810,10 @@ case $PROJECT in add_package ubuntu-server-minimal.ubuntu-server.installer.$flavor $kernel_metapkg LIVE_PASSES="${LIVE_PASSES:+$LIVE_PASSES }ubuntu-server-minimal.ubuntu-server.installer.$flavor" done + + /usr/share/livecd-rootfs/checkout-translations-branch \ + lp:~canonical-foundations/subiquity/translations-export \ + config/catalog-translations ;; *) echo "unrecognized subproject for server: '$SUBPROJECT'" diff --git a/live-build/lb_binary_layered b/live-build/lb_binary_layered index acd6f591..af029c05 100755 --- a/live-build/lb_binary_layered +++ b/live-build/lb_binary_layered @@ -138,6 +138,13 @@ build_layered_squashfs () { fi create_squashfs "overlay.${pass}/" ${squashfs_f} + + if [ -f config/$pass.catalog-in.yaml ]; then + /usr/share/livecd-rootfs/update-source-catalog --output livecd.${PROJECT}.install-sources.yaml \ + --template config/$pass.catalog-in.yaml \ + --size $(du -B 1 -s chroot/ | cut -f1) --squashfs ${pass}.squashfs \ + --translations config/catalog-translations + fi fi if [ -n "$lowerdirs" ]; then diff --git a/live-build/ubuntu-server/ubuntu-server-minimal.catalog-in.yaml b/live-build/ubuntu-server/ubuntu-server-minimal.catalog-in.yaml new file mode 100644 index 00000000..7e092963 --- /dev/null +++ b/live-build/ubuntu-server/ubuntu-server-minimal.catalog-in.yaml @@ -0,0 +1,8 @@ +name: "Ubuntu Server (minimized)" +description: >- + This version has been customized to have a small runtime footprint + in order to increase workload density in environments where humans + are not expected to log in. +id: ubuntu-server-minimal +type: fsimage +variant: server diff --git a/live-build/ubuntu-server/ubuntu-server-minimal.ubuntu-server.catalog-in.yaml b/live-build/ubuntu-server/ubuntu-server-minimal.ubuntu-server.catalog-in.yaml new file mode 100644 index 00000000..722fc92a --- /dev/null +++ b/live-build/ubuntu-server/ubuntu-server-minimal.ubuntu-server.catalog-in.yaml @@ -0,0 +1,8 @@ +name: "Ubuntu Server" +description: >- + The default install contains a curated set of packages that provide + a comfortable experience for operating your server. +id: ubuntu-server +default: yes +type: fsimage-layered +variant: server