diff --git a/debian/changelog b/debian/changelog index 38845894..bb709881 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +livecd-rootfs (23.10.12) mantic; urgency=medium + + * live-build/auto/build: Avoid purging packages for ubuntu-cpc. + With the switch to the ubuntu-cloud-minimal seed, we + don't really need to purge anything now. On the contrary, + the purging of packages if not installed, fails with the + exit code of 100. + + -- Utkarsh Gupta Tue, 08 Aug 2023 15:44:42 +0530 + +livecd-rootfs (23.10.11) mantic; urgency=medium + + [ Łukasz 'sil2100' Zemczak ] + * canary: enable locale support for canary layers. + + [ Michael Hudson-Doyle ] + * Remove additional dependencies from subiquity units as they are now + interfering with the boot process. (LP: #2028862) + + -- Michael Hudson-Doyle Tue, 08 Aug 2023 13:57:47 +1200 + livecd-rootfs (23.10.10) mantic; urgency=medium * Revert "desktop, budgie: no need to include the kernel directly, it is diff --git a/live-build/auto/build b/live-build/auto/build index adc54467..2a94e910 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -369,21 +369,24 @@ EOF # done in chroot hooks. if [ -z "$PASSES" ]; then if [ "${SUBPROJECT:-}" = minimized ]; then - # force removal of initramfs-tools, which we assert is not - # required for any minimized images but is still pulled in by - # default - # also remove landscape-common, which is heavyweight and - # in the server seed only to provide /etc/motd content which - # would only be seen by humans - Chroot chroot "env DEBIAN_FRONTEND=noninteractive \ - apt-get -y purge initramfs-tools busybox-initramfs \ - landscape-common" - # and if initramfs-tools was configured before our kernel, - # /etc/kernel/postinst.d/initramfs-tools will have created - # an initramfs despite the generic dpkg-divert; so remove it - # here. - rm -f chroot/boot/initrd.img-* - + # ubuntu-cpc has moved to using ubuntu-cloud-minimal seed + # for minimized images, so don't need these purges anymore. + if [ "$PROJECT" != ubuntu-cpc ]; then + # force removal of initramfs-tools, which we assert is not + # required for any minimized images but is still pulled in by + # default + # also remove landscape-common, which is heavyweight and + # in the server seed only to provide /etc/motd content which + # would only be seen by humans + Chroot chroot "env DEBIAN_FRONTEND=noninteractive \ + apt-get -y purge initramfs-tools busybox-initramfs \ + landscape-common" + # and if initramfs-tools was configured before our kernel, + # /etc/kernel/postinst.d/initramfs-tools will have created + # an initramfs despite the generic dpkg-divert; so remove it + # here. + rm -f chroot/boot/initrd.img-* + fi # temporary workaround: don't remove linux-base which # may have no other reverse-depends currently Chroot chroot "env DEBIAN_FRONTEND=noninteractive \ diff --git a/live-build/auto/config b/live-build/auto/config index b5c722a4..5f2c8c59 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -744,6 +744,13 @@ case $PROJECT in remove_package minimal.standard.live ubiquity-frontend-gtk # the enhanced-secureboot layer, contains all packages for the enhanced secureboot install add_package minimal.standard.enhanced-secureboot cryptsetup boot-managed-by-snapd + + # language support + seeded_langs="$(get_seeded_languages desktop-minimal desktop)" + echo "$seeded_langs" | tr ' ' ',' > config/seeded-languages + derive_language_layers minimal desktop-minimal desktop-minimal-default-languages "$seeded_langs" + derive_language_layers minimal.standard desktop desktop-default-languages "$seeded_langs" + # now let's create the neccessary catalog files # TODO: make sure that we handle locale_support: langpack correctly cat <<-EOF > config/minimal.catalog-in.yaml @@ -753,7 +760,7 @@ case $PROJECT in id: ubuntu-desktop-minimal type: fsimage-layered variant: desktop - locale_support: none + locale_support: langpack EOF cat <<-EOF > config/minimal.standard.catalog-in.yaml name: "Ubuntu Desktop" @@ -762,7 +769,7 @@ case $PROJECT in id: ubuntu-desktop type: fsimage-layered variant: desktop - locale_support: none + locale_support: langpack default: yes EOF cat <<-EOF > config/minimal.standard.classic.catalog-in.yaml diff --git a/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf index eebf38b4..077184fa 100644 --- a/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf +++ b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/serial-getty@.service.d/subiquity-serial.conf @@ -1,6 +1,5 @@ [Unit] Description=Subiquity, the installer for Ubuntu Server %I -After=snapd.seeded.service StartLimitInterval=0 [Service] diff --git a/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf index c1af5666..6500a675 100644 --- a/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf +++ b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf @@ -1,6 +1,5 @@ [Unit] IgnoreOnIsolate=yes -After=systemd-user-sessions.service plymouth-quit-wait.service snap.seeded.service [Service] Environment=SNAP_REEXEC=0