From 3a99b297d4e3364456918b7f1397c9d830a951c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Tue, 30 Jan 2024 11:29:50 +0100 Subject: [PATCH] For ubuntu-server, consider the actual kernel flavor when dealing with netboot layers - even if we don't really care in the end. --- debian/changelog | 7 +++++++ live-build/auto/config | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1714c981..09d9da22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (24.04.25) UNRELEASED; urgency=medium + + * live-build/auto/config: for ubuntu-server, consider the actual kernel + flavor when dealing with netboot layers - even if we don't really care. + + -- Łukasz 'sil2100' Zemczak Tue, 30 Jan 2024 11:27:46 +0100 + livecd-rootfs (24.04.24) noble; urgency=medium [ Tomáš Virtus ] diff --git a/live-build/auto/config b/live-build/auto/config index aa85fb15..4fe67dcd 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -993,16 +993,16 @@ case $PROJECT in done case $ARCH in amd64) - add_package ubuntu-server-minimal.ubuntu-server.installer.generic.netboot grub-pc shim-signed pxelinux + add_package ubuntu-server-minimal.ubuntu-server.installer.$flavor.netboot grub-pc shim-signed pxelinux ;; arm64) - add_package ubuntu-server-minimal.ubuntu-server.installer.generic.netboot shim-signed + add_package ubuntu-server-minimal.ubuntu-server.installer.$flavor.netboot shim-signed ;; *) - add_package ubuntu-server-minimal.ubuntu-server.installer.generic.netboot + add_package ubuntu-server-minimal.ubuntu-server.installer.$flavor.netboot ;; esac - NO_SQUASHFS_PASSES=ubuntu-server-minimal.ubuntu-server.installer.generic.netboot + NO_SQUASHFS_PASSES=ubuntu-server-minimal.ubuntu-server.installer.$flavor.netboot /usr/share/livecd-rootfs/checkout-translations-branch \ https://git.launchpad.net/subiquity po config/catalog-translations