Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-11-20 18:54:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

ubuntu: use an array for prepare_args

Browse Source 
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
This commit is contained in:
Olivier Gayot 2025-11-18 16:50:29 +01:00
parent 9164e58d83
commit 001aed3b3b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ get_snaps_args()
# 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=()
# for the dangerous subproject, we need the dangerous model!
if [ "$SUBPROJECT" = "dangerous" ]; then
@ -74,7 +74,7 @@ if [ "$SUBPROJECT" = "dangerous" ]; then
# computed in snap_validate_seed.
model=/usr/share/livecd-rootfs/live-build/${PROJECT}/ubuntu-classic-amd64-dangerous.model
while read snap; do
prepare_args="$prepare_args --snap=${snap}=edge"
prepare_args+=("--snap=${snap}=edge")
done < config/missing-providers
else
# We're currently using the dangerous model for the non-dangerous ISO
@ -82,7 +82,7 @@ else
# edge like the dangerous model has, we want most of them from stable
# (excluding pc-kernel).
while read -r snap_arg; do
prepare_args="$prepare_args $snap_arg"
prepare_args+=("$snap_arg")
done < <(get_snaps_args /usr/share/livecd-rootfs/live-build/"${PROJECT}"/ubuntu-classic-amd64.model | grep -v -F pc-kernel)
fi
@ -95,7 +95,7 @@ fi
# snap versions regardless of phasing status
env SNAPPY_STORE_NO_CDN=1 UBUNTU_STORE_COHORT_KEY="+" snap prepare-image \
--classic $model $channel ${prepare_args:+$prepare_args} chroot
--classic $model $channel "${prepare_args[@]}" chroot
mv chroot/system-seed/systems/* chroot/system-seed/systems/enhanced-secureboot-desktop
rsync -av chroot/system-seed/{systems,snaps} chroot/var/lib/snapd/seed