releasing package livecd-rootfs version 26.04.14

changelog
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2026-01-31 15:14:19 +00:00 · 2026-01-22 09:21:55 -07:00 · 2026-01-22 16:22:21 +01:00 · 2026-01-22 16:22:21 +01:00 · 2026-01-13 11:57:31 +01:00 · 2026-01-06 22:03:29 +13:00
5 changed files with 44 additions and 5 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,20 @@
+livecd-rootfs (26.04.14) resolute; urgency=medium
+
+  [ Olivier Gayot ]
+  * desktop: build stable image with snapd from beta. Snapd 2.74 has just been
+    uploaded to beta. Let's stop using the version declared in the dangerous model.
+
+  [ Didier Roche-Tolomelli ]
+  * desktop: add (commented out) config to force reexecution of snapd snap version
+
+ -- Olivier Gayot <olivier.gayot@canonical.com>  Thu, 22 Jan 2026 10:13:36 +0100
+
+livecd-rootfs (26.04.13) resolute; urgency=medium
+
+  * Bootstrap and install variant packages if ARCH_VARIANT is set.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Tue, 06 Jan 2026 22:03:15 +1300
+
 livecd-rootfs (26.04.12) resolute; urgency=medium

  * desktop: add variables pointing to the different models (stable & dangerous).
--- a/live-build/auto/build
+++ b/live-build/auto/build
@ -119,6 +119,12 @@ Expire-Date: 0
 		exit $ec
 	fi

+	if [ -n "${ARCH_VARIANT:-}" ]; then
+		cat > chroot/etc/apt/apt.conf.d/90arch-variant <<EOF
+APT::Architecture-Variants "${ARCH_VARIANT}";
+EOF
+	fi
+
 	# Set locale to C.UTF-8 by default.  This may be overridden later.
 	echo "LANG=C.UTF-8" > chroot/etc/default/locale

--- a/live-build/auto/config
+++ b/live-build/auto/config
@ -660,7 +660,7 @@ if ! [ -e config/germinate-output/structure ]; then
 	fi
        (cd config/germinate-output && germinate --no-rdepends --no-installer \
                -S $SEEDMIRROR -m $MIRROR -d $SUITE,$SUITE-updates \
-                -s $FLAVOUR.$SUITE $GERMINATE_ARG -a $ARCH)
+                -s $FLAVOUR.$SUITE $GERMINATE_ARG -a ${ARCH_VARIANT:-$ARCH})
 fi

 # Common functionality for layered desktop images
@ -1365,6 +1365,7 @@ lb config noauto \
 	--checksums none \
 	--cache false \
 	${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \
+	${ARCH_VARIANT:+--bootstrap-arch "$ARCH_VARIANT"} \
 	$OPTS \
 	"$@"

--- a/live-build/ubuntu/hooks/030-ubuntu-live-system-seed.binary
+++ b/live-build/ubuntu/hooks/030-ubuntu-live-system-seed.binary
@ -155,16 +155,25 @@ else
    # 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-desktop-integration (for TPM/FDE)
    # * firmware-updater (for TPM/FDE)
    # * desktop-security-center (for TPM/FDE)
-    snaps_from_dangerous=(snapd snapd-desktop-integration firmware-updater desktop-security-center)
-    for snap_arg in $(get_snaps_args_excluding "$stable_model" "${snaps_from_dangerous[@]}"); do
+    snaps_from_dangerous=(snapd-desktop-integration firmware-updater desktop-security-center)
+
+    # For these snaps, we ignore the model entirely.
+    snaps_from_beta=(snapd)
+    for snap in "${snaps_from_beta[@]}"; do
+        prepare_args+=("--snap=$snap=beta")
+    done
+
+    # snaps that we are special casing.
+    _exclude=("${snaps_from_dangerous[@]}" "${snaps_from_beta[@]}")
+
+    for snap_arg in $(get_snaps_args_excluding "$stable_model" "${_exclude[@]}"); do
        prepare_args+=("$snap_arg")
    done

-    for comp in $(get_components_excluding "$stable_model" "${snaps_from_dangerous[@]}"); do
+    for comp in $(get_components_excluding "$stable_model" "${_exclude[@]}"); do
        components+=("$comp")
    done
    for comp in $(get_components "$dangerous_model" "${snaps_from_dangerous[@]}"); do
--- a/live-build/ubuntu/includes.chroot.minimal.standard.live/etc/systemd/system/snapd.service.d/snapd-snap-reexec.conf
+++ b/live-build/ubuntu/includes.chroot.minimal.standard.live/etc/systemd/system/snapd.service.d/snapd-snap-reexec.conf
@ -0,0 +1,6 @@
+# force reexecuting the snapd snap version on the live system
+# while developping features that only lands on edge, even if the
+# deb version is higher.
+# This allows automated tests to always run what’s next.
+#[Service]
+#Environment="SNAP_REEXEC=force"
Author	SHA1	Message	Date
Dan Bungert	ddbf8bf828	releasing package livecd-rootfs version 26.04.14	2026-01-22 09:21:55 -07:00
Olivier Gayot	74f5986230	changelog Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>	2026-01-22 16:22:21 +01:00
Olivier Gayot	563d142029	ubuntu: build with snapd from beta Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>	2026-01-22 16:22:21 +01:00
Didier Roche	755f0b0d15	Allow force reexecution of snapd snap version When developping and using snapd from edge on cross-team efforts like TPM/FDE, allow snapd to reexec to the snap version unconditionnaly, on live system. . This is commented so that the future revert to stable include it and we don’t forget to readd that next time this kind of effort is needed.	2026-01-13 11:57:31 +01:00
Michael Hudson-Doyle	d756afd205	releasing package livecd-rootfs version 26.04.13	2026-01-06 22:03:29 +13:00
Michael Hudson-Doyle	9c5d326e56	Bootstrap and install variant packages if ARCH_VARIANT is set.	2026-01-06 21:26:40 +13:00