From dd83c55b61beae5d17543706013cd54ccd232b1d Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Wed, 1 Apr 2020 11:31:10 +0100
Subject: [PATCH] Use generic-hwe-20.04 as the default (rolling) kernel
 flavour.

---
 debian/changelog       |  1 +
 live-build/auto/config | 14 +++++---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4226188d..57518a5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 livecd-rootfs (2.657) UNRELEASED; urgency=medium
 
   * Determine kernel image/initrd version exactly, using apt data.
+  * Use generic-hwe-20.04 as the default (rolling) kernel flavour.
 
  -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 01 Apr 2020 11:13:42 +0100
 
diff --git a/live-build/auto/config b/live-build/auto/config
index 6302715a..40d183bb 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -560,6 +560,9 @@ if ! [ -e config/germinate-output/structure ]; then
                 ${COMPONENTS:+-c "$COMPONENTS"} -a $ARCH)
 fi
 
+# Default kernel
+KERNEL_FLAVOURS='generic-hwe-20.04'
+
 case $PROJECT in
 	ubuntu|ubuntu-dvd)
 
@@ -581,10 +584,9 @@ case $PROJECT in
 				LIVE_TASK='ubuntu-live'
 				add_task install minimal standard ubuntu-desktop
 				add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages
-				KERNEL_FLAVOURS='generic'
 				case $ARCH in
 					amd64)
-						KERNEL_FLAVOURS='generic oem-20.04'
+						KERNEL_FLAVOURS="$KERNEL_FLAVOURS oem-20.04"
 						;;
 				esac
 				;;
@@ -629,9 +631,6 @@ case $PROJECT in
 		add_package install xterm
 		LIVE_TASK='xubuntu-live'
 		COMPONENTS='main restricted universe multiverse'
-		case $ARCH in
-			amd64|i386)	KERNEL_FLAVOURS=generic ;;
-		esac
 		;;
 
 	ubuntu-netbook)
@@ -649,9 +648,6 @@ case $PROJECT in
 		add_task install minimal standard lubuntu-desktop
 		LIVE_TASK='lubuntu-live'
 		COMPONENTS='main restricted universe multiverse'
-		case $ARCH in
-			amd64|i386)	KERNEL_FLAVOURS=generic ;;
-		esac
 		;;
 
 	ubuntu-gnome)
@@ -676,7 +672,7 @@ case $PROJECT in
 		add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-fonts ubuntustudio-graphics ubuntustudio-video ubuntustudio-publishing ubuntustudio-photography
 		COMPONENTS='main restricted universe multiverse'
 		case $ARCH in
-			amd64|i386)	KERNEL_FLAVOURS=lowlatency ;;
+			amd64|i386)	KERNEL_FLAVOURS=lowlatency-hwe-20.04 ;;
 		esac
 		;;