Merge branch 'no-tpm-arm64' into ubuntu/master

This commit is contained in:
michael.hudson@canonical.com 2026-02-20 12:43:14 +13:00
commit 49a0415299
No known key found for this signature in database
GPG Key ID: 80E627A0AB757E23
2 changed files with 15 additions and 1 deletions

7
debian/changelog vendored
View File

@ -9,6 +9,13 @@ livecd-rootfs (26.04.20) UNRELEASED; urgency=medium
-- Michael Raymond <michael.raymond@canonical.com> Thu, 19 Feb 2026 14:38:37 -0500
livecd-rootfs (26.04.19ubuntu1) UNRELEASED; urgency=medium
* 030-ubuntu-live-system-seed.binary: do not run if there is no layer to
install the system, in particular on arm64.
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Thu, 19 Feb 2026 19:55:26 +1300
livecd-rootfs (26.04.19) resolute; urgency=medium
* Translate the debian-cd tools/boot/$series/boot-$arch scripts to Python

View File

@ -2,7 +2,7 @@
# create the system seed for TPM-backed FDE in the live layer of the installer.
set -eux
set -eu
case ${PASS:-} in
*.live)
@ -13,8 +13,15 @@ case ${PASS:-} in
esac
. config/binary
. config/common
. config/functions
set -x
if ! echo $PASSES | grep --quiet enhanced-secureboot; then
# Only run this hook if there is going to be a layer that installs it...
exit 0
fi
# Naive conversion from YAML to JSON. This is needed because yq is in universe
# (but jq is not).