Imported 2.728

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,19 @@
+livecd-rootfs (2.728) impish; urgency=medium
+
+  [ Dan Bungert ]
+  * Remove the customized final message from the live server cloud-init config
+    as it is no longer displayed.
+
+  [ Michael Hudson-Doyle ]
+  * Make sure the process that prints SSH connection info on s390x has
+    its output connected to the console. (LP: #1933523)
+
+  [ Brian Murray ]
+  * Add a subarch of intel-iotg which is used for creating images with a
+    kernel optimized for Intel IOT devices.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Thu, 01 Jul 2021 11:00:08 +1200
+
 livecd-rootfs (2.727) impish; urgency=medium
 
   * Remove assumption in 032-installer-squashfs.binary that all core snaps

live-build/auto/config

@@ -299,7 +299,7 @@ if [ -z "${IMAGEFORMAT:-}" ]; then
 	case $PROJECT:${SUBPROJECT:-} in
 		ubuntu-cpc:*|ubuntu:desktop-preinstalled)
 			case $SUBARCH in
-				raspi)
+				raspi|intel-iotg)
 					IMAGEFORMAT=ubuntu-image
 					;;
 				*)
@@ -632,20 +632,32 @@ case $PROJECT in
 
 			desktop-preinstalled)
 				add_task install minimal standard ubuntu-desktop
-				if [ "$SUBARCH" = "raspi" ]; then
+				case $SUBARCH in
-					add_task install ubuntu-desktop-raspi
+					raspi)
-					# XXX: Are those actually needed? I see we use those for ubuntu-cpc, which is the project
+						add_task install ubuntu-desktop-raspi
-					#  for existing raspi preinstalled images
+						# XXX: Are those actually needed? I see we use those for ubuntu-cpc, which is the project
-					# XXX: I would prefer to use --hdd-label=desktop-rootfs like 040-hyperv-desktop-images.binary
+						#  for existing raspi preinstalled images
-					OPTS="${OPTS:+$OPTS }--initramfs=none"
+						# XXX: I would prefer to use --hdd-label=desktop-rootfs like 040-hyperv-desktop-images.binary
-					OPTS="${OPTS:+$OPTS }--system=normal"
+						OPTS="${OPTS:+$OPTS }--initramfs=none"
-					OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
+						OPTS="${OPTS:+$OPTS }--system=normal"
-					OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
+						OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
-					OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
+						OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
-				fi
+						OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
-				## Otherwise HYPERV image options.... *crickets* see the hyperv hook
+						;;
+					intel-iotg)
+						KERNEL_FLAVOURS='image-intel'
+						COMPONENTS='main restricted universe'
+						OPTS="${OPTS:+$OPTS }--initramfs=none"
+						OPTS="${OPTS:+$OPTS }--system=normal"
+						OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
+						OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
+						OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
+						;;
+					*)
+						## Otherwise HYPERV image options.... *crickets* see the hyperv hook
+						;;
+				esac
 				;;
-
 			*)
 				LIVE_TASK='ubuntu-live'
 				add_task install minimal standard ubuntu-desktop
@@ -807,6 +819,10 @@ case $PROJECT in
 			amd64)
 				if [ "${SUBARCH:-}" = "generic" ]; then
 					KERNEL_FLAVOURS=generic
+				elif [ "${SUBARCH:-}" = "intel-iotg" ]; then
+					KERNEL_FLAVOURS=image-intel
+					COMPONENTS='main restricted universe'
+					OPTS="${OPTS:+$OPTS }--initramfs=none"
 				fi
 				;;
 			riscv64*)
@@ -960,6 +976,14 @@ case $PROJECT in
 	_)
 		add_chroot_hook remove-python-py
 		;;
+	amd64)
+		KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}"
+		case $SUBARCH in
+			intel-iotg)
+				COMPONENTS='main restricted universe'
+				KERNEL_FLAVOURS='image-intel'
+		esac
+		;;
 esac
 
 lb config noauto \

live-build/ubuntu-server/includes.binary/overlay/etc/cloud/cloud.cfg

@@ -32,7 +32,7 @@ network:
                 name: "eth*"
             dhcp4: true
 
-final_message: "## template: jinja\nCloud-init v. {{version}} finished at {{timestamp}}. Datasource {{datasource}}.  Up {{uptime}} seconds\n\n\nWelcome to Ubuntu Server Installer!\n\nAbove you will find SSH host keys and a random password set for the `installer` user. You can use these credentials to ssh-in and complete the installation. If you provided SSH keys in the cloud-init datasource, they were also provisioned to the installer user.\n\nIf you have access to the graphical console, like TTY1 or HMC ASCII terminal you can complete the installation there too."
+# We used to have a custom final_message here.  Just use the default instead.
 
 # Example datasource config
 # datasource:

live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-getty@sclp_line0.service.d/subiquity-serial.conf

@@ -1,3 +1,4 @@
 [Service]
+StandardOutput=tty
 ExecStart=
 ExecStart=/usr/bin/snap run subiquity --ssh