Imported 23.10.12

No reason for CPC update specified.

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 <utkarsh@ubuntu.com>  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 <michael.hudson@ubuntu.com>  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

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
+			# ubuntu-cpc has moved to using ubuntu-cloud-minimal seed
-			# required for any minimized images but is still pulled in by
+			# for minimized images, so don't need these purges anymore.
-			# default
+			if [ "$PROJECT" != ubuntu-cpc ]; then
-			# also remove landscape-common, which is heavyweight and
+				# force removal of initramfs-tools, which we assert is not
-			# in the server seed only to provide /etc/motd content which
+				# required for any minimized images but is still pulled in by
-			# would only be seen by humans
+				# default
-			Chroot chroot "env DEBIAN_FRONTEND=noninteractive \
+				# also remove landscape-common, which is heavyweight and
-				apt-get -y purge initramfs-tools busybox-initramfs \
+				# in the server seed only to provide /etc/motd content which
-					landscape-common"
+				# would only be seen by humans
-			# and if initramfs-tools was configured before our kernel,
+				Chroot chroot "env DEBIAN_FRONTEND=noninteractive \
-			# /etc/kernel/postinst.d/initramfs-tools will have created
+					apt-get -y purge initramfs-tools busybox-initramfs \
-			# an initramfs despite the generic dpkg-divert; so remove it
+						landscape-common"
-			# here.
+				# and if initramfs-tools was configured before our kernel,
-			rm -f chroot/boot/initrd.img-*
+				# /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 \

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

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]

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