From ac9fd8fd4c350ff144dfea78b5caf60175a08e3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Thu, 11 Apr 2024 10:45:34 +0200 Subject: [PATCH] Fix the UC24 builds: use --snap instead of --extra-snaps. --- debian/changelog | 6 ++++++ live-build/auto/config | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5301597c..497a0f4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (24.04.61) UNRELEASED; urgency=medium + + * Fix the UC24 builds: use --snap instead of --extra-snaps. + + -- Łukasz 'sil2100' Zemczak Thu, 11 Apr 2024 10:44:04 +0200 + livecd-rootfs (24.04.60) noble; urgency=medium * Drop use of 'laptop' for x13s as this is now migrated to generic. diff --git a/live-build/auto/config b/live-build/auto/config index 78155da3..3ccf349d 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -516,7 +516,7 @@ case $IMAGEFORMAT in ;; esac for snap in $EXTRA_SNAPS; do - UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --extra-snaps $snap" + UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --snap=$snap" done echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common