Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-12-19 10:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ubuntu: declare variables from stable & dangerous models

Browse Source 
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
This commit is contained in:
Olivier Gayot 2025-12-16 12:42:00 +01:00
parent c147c15291
commit 72511a0381
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (26.04.12) UNRELEASED; urgency=medium
* desktop: add variables pointing to the different models (stable & dangerous).
-- Olivier Gayot <olivier.gayot@canonical.com> Tue, 16 Dec 2025 14:54:17 +0100
livecd-rootfs (26.04.11) resolute; urgency=medium livecd-rootfs (26.04.11) resolute; urgency=medium
[ Valentin Haudiquet ] [ Valentin Haudiquet ]

21
live-build/ubuntu/hooks/030-ubuntu-live-system-seed.binary
View File

@ -78,10 +78,8 @@ get_all_components()
# env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 brand-id=canonical model=ubuntu-classic-2410-amd64 > config/classic-model.model # env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 brand-id=canonical model=ubuntu-classic-2410-amd64 > config/classic-model.model
# #
# model=/usr/share/livecd-rootfs/live-build/${PROJECT}/ubuntu-classic-amd64.model dangerous_model=/usr/share/livecd-rootfs/live-build/${PROJECT}/ubuntu-classic-amd64-dangerous.model
# Normally we use the non-dangerous model here. Use the dangerous one for now stable_model=/usr/share/livecd-rootfs/live-build/${PROJECT}/ubuntu-classic-amd64.model
# until we get snaps on stable 26.04 tracks and channels.
model=/usr/share/livecd-rootfs/live-build/${PROJECT}/ubuntu-classic-amd64-dangerous.model
prepare_args=() prepare_args=()
@ -91,21 +89,24 @@ if [ "$SUBPROJECT" = "dangerous" ]; then
# require different content snaps to be installed, so they must be # require different content snaps to be installed, so they must be
# included in the system as well. We just use the same list as was # included in the system as well. We just use the same list as was
# computed in snap_validate_seed. # computed in snap_validate_seed.
model=/usr/share/livecd-rootfs/live-build/${PROJECT}/ubuntu-classic-amd64-dangerous.model model="${dangerous_model}"
while read snap; do while read snap; do
prepare_args+=("--snap=${snap}=edge") prepare_args+=("--snap=${snap}=edge")
done < config/missing-providers done < config/missing-providers
else else
# We're currently using the dangerous model for the non-dangerous ISO # Normally we use the stable model here. Use the dangerous one for now
# because it allows us to override snaps. But we don't want all snaps from # until we get snaps on stable 26.04 tracks and channels.
# edge like the dangerous model has, we want most of them from stable #model="${stable_model}"
# excluding: model="${dangerous_model}"
# We're currently using the dangerous model for the stable image 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:
# * snapd (for TPM/FDE) # * snapd (for TPM/FDE)
# * firmware-updater (for TPM/FDE) # * firmware-updater (for TPM/FDE)
# * desktop-security-center (for TPM/FDE) # * desktop-security-center (for TPM/FDE)
while read -r snap_arg; do while read -r snap_arg; do
prepare_args+=("$snap_arg") prepare_args+=("$snap_arg")
done < <(get_snaps_args /usr/share/livecd-rootfs/live-build/"${PROJECT}"/ubuntu-classic-amd64.model \ done < <(get_snaps_args "$stable_model" \
| grep -v -F -e snapd -e firmware-updater -e desktop-security-center) | grep -v -F -e snapd -e firmware-updater -e desktop-security-center)
fi fi