From b3ddf6a78a5effb783b9c70ae95035db4af1f5ee Mon Sep 17 00:00:00 2001 From: Olivier Gayot Date: Wed, 19 Nov 2025 10:32:21 +0100 Subject: [PATCH] ubuntu: use snapd, desktop-security-center and firmware-updater from edge for TPM/FDE Signed-off-by: Olivier Gayot --- .../ubuntu/hooks/030-ubuntu-live-system-seed.binary | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/live-build/ubuntu/hooks/030-ubuntu-live-system-seed.binary b/live-build/ubuntu/hooks/030-ubuntu-live-system-seed.binary index 44afa9d8..475bf37a 100644 --- a/live-build/ubuntu/hooks/030-ubuntu-live-system-seed.binary +++ b/live-build/ubuntu/hooks/030-ubuntu-live-system-seed.binary @@ -80,10 +80,15 @@ else # We're currently using the dangerous model for the non-dangerous ISO # because it allows us to override snaps. But we don't want all snaps from # edge like the dangerous model has, we want most of them from stable - # (excluding pc-kernel). + # excluding: + # * pc-kernel - which currently does not exist on stable + # * snapd (for TPM/FDE) + # * firmware-updater (for TPM/FDE) + # * desktop-security-center-center (for TPM/FDE) while read -r snap_arg; do prepare_args+=("$snap_arg") - done < <(get_snaps_args /usr/share/livecd-rootfs/live-build/"${PROJECT}"/ubuntu-classic-amd64.model | grep -v -F pc-kernel) + done < <(get_snaps_args /usr/share/livecd-rootfs/live-build/"${PROJECT}"/ubuntu-classic-amd64.model \ + | grep -v -F -e pc-kernel -e snapd -e firmware-updater -e desktop-security-center) fi channel=""