server: fix hwe kernel layer having multiple kernels

LP: #2112501
This commit is contained in:
Dan Bungert 2025-06-04 17:42:01 -06:00
parent 8679885bc0
commit 4c2baf9e58
2 changed files with 20 additions and 6 deletions

View File

@ -1065,16 +1065,12 @@ case $PROJECT in
exit 1
fi
add_pass ubuntu-server-minimal.ubuntu-server.installer.$flavor
if [ "$first_kernel" = "y" ]; then
# Put the first kernel offered into the base layer
kernel_layer=ubuntu-server-minimal
first_kernel=n
else
# and subsequent ones into their own layer
kernel_layer=ubuntu-server-minimal.ubuntu-server.installer.$flavor
add_package ubuntu-server-minimal $kernel_metapkg
fi
add_package $kernel_layer $kernel_metapkg
add_package ubuntu-server-minimal.ubuntu-server.installer.$flavor $kernel_metapkg
LIVE_PASSES="${LIVE_PASSES:+$LIVE_PASSES }ubuntu-server-minimal.ubuntu-server.installer.$flavor"
done

View File

@ -0,0 +1,18 @@
#!/bin/bash -eux
# vi: ts=4 noexpandtab
case $PASS in
ubuntu-server-minimal.ubuntu-server.installer.*.*)
exit 0
;;
ubuntu-server-minimal.ubuntu-server.installer.*)
;;
*)
exit 0
;;
esac
# remove excess kernels. auto/config arranges for the correct one to be
# installed.
apt-get --yes remove --purge 'linux-image*'