From d7433f8c3711f6b85c90f2355e52d2a705917258 Mon Sep 17 00:00:00 2001
From: CloudBuilder <cloud-image-builders@lists.canonical.com>
Date: Fri, 1 Sep 2023 00:51:09 +0000
Subject: [PATCH] Imported 23.10.29 from mantic-release pocket.

No reason for CPC update specified.
---
 debian/changelog                              |  7 +++++
 live-build/auto/config                        |  6 ++---
 .../ubuntu/hooks/020-canary-live.binary       | 27 -------------------
 3 files changed, 10 insertions(+), 30 deletions(-)
 delete mode 100755 live-build/ubuntu/hooks/020-canary-live.binary

diff --git a/debian/changelog b/debian/changelog
index bd9c522b..d5fb11e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (23.10.29) mantic; urgency=medium
+
+  * canary: switch to use the live task, try to use KERNEL_FLAVOURS instead
+    of a manual kernel add_package.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 31 Aug 2023 11:57:11 +0200
+
 livecd-rootfs (23.10.28) mantic; urgency=medium
 
   * Allow stderr in the autopkgtest.
diff --git a/live-build/auto/config b/live-build/auto/config
index 451a7d61..13eb7b45 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -724,12 +724,12 @@ case $PROJECT in
 			canary)
 				touch config/universe-enabled
 				PASSES_TO_LAYERS="true"
+				KERNEL_FLAVOURS='generic-hwe-22.04'
 				# the standard layer, contains all base common packages for later layers
 				add_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages
 				add_package standard cloud-init
 				# the live layer, contains all packages for the live session installer
-				# TODO: we should probably add the kernel per KERNEL_FLAVOURS
-				add_package standard.live linux-generic casper lvm2 mdadm cryptsetup dctrl-tools
+				add_task standard.live ubuntu-live
 				remove_package standard.live ubiquity-frontend-gtk
 				add_snap standard.live ubuntu-desktop-installer/classic
 				# the enhanced-secureboot layer, contains all packages for the enhanced secureboot install
@@ -1298,7 +1298,7 @@ case "$ARCH${SUBARCH:++$SUBARCH}" in
 esac
 
 case $PROJECT:${SUBPROJECT:-} in
-	ubuntu-server:*|ubuntu-base:*|ubuntu-oci:*|ubuntu:canary)
+	ubuntu-server:*|ubuntu-base:*|ubuntu-oci:*)
 		OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
 		KERNEL_FLAVOURS=none
 		BINARY_REMOVE_LINUX=false
diff --git a/live-build/ubuntu/hooks/020-canary-live.binary b/live-build/ubuntu/hooks/020-canary-live.binary
deleted file mode 100755
index 2e5e014d..00000000
--- a/live-build/ubuntu/hooks/020-canary-live.binary
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh
-
-set -eux
-
-case ${PASS:-} in
-    standard.live)
-        ;;
-    *)
-        exit 0
-        ;;
-esac
-
-case ${SUBPROJECT:-} in
-    canary)
-        ;;
-    *)
-        echo "We don't run canary hooks for this project."
-        exit 0
-        ;;
-esac
-
-. config/binary
-. config/functions
-
-mv chroot/boot/initrd.img-* ${PWD}/livecd.${PROJECT}.initrd-generic
-mv chroot/boot/vmlinu?-* ${PWD}/livecd.${PROJECT}.kernel-generic
-chmod a+r ${PWD}/livecd.${PROJECT}.initrd-generic ${PWD}/livecd.${PROJECT}.kernel-generic