From 733ad14e33e4eea9856c7105b3c6ec008b8c12be Mon Sep 17 00:00:00 2001
From: Olivier Gayot <olivier.gayot@canonical.com>
Date: Mon, 9 Feb 2026 16:41:39 +0100
Subject: [PATCH] ubuntu: for the stable image, use the stable model

Let's stop leaning on overrides for now.

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
---
 debian/changelog                              |  7 +++++
 .../hooks/030-ubuntu-live-system-seed.binary  | 31 ++++++++-----------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e705ee0a..063acaf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (26.04.17) UNRELEASED; urgency=medium
+
+  * desktop: build the stable ISO using the stable model - essentially
+    reverting all the hacks.
+
+ -- Olivier Gayot <olivier.gayot@canonical.com>  Thu, 12 Feb 2026 10:20:52 +0100
+
 livecd-rootfs (26.04.16) resolute; urgency=medium
 
   * Rename ISO_STATUS to BUILD_TYPE for image builds.
diff --git a/live-build/ubuntu/hooks/030-ubuntu-live-system-seed.binary b/live-build/ubuntu/hooks/030-ubuntu-live-system-seed.binary
index 6b268833..3f20c550 100644
--- a/live-build/ubuntu/hooks/030-ubuntu-live-system-seed.binary
+++ b/live-build/ubuntu/hooks/030-ubuntu-live-system-seed.binary
@@ -148,31 +148,26 @@ if [ "$SUBPROJECT" = "dangerous" ]; then
         components+=("$comp")
     done
 else
-    # Normally we use the stable model here.  Use the dangerous one for now
-    # until we get snaps on stable 26.04 tracks and channels.
-    #model="${stable_model}"
-    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-desktop-integration (for TPM/FDE)
-    # * firmware-updater (for TPM/FDE)
-    # * desktop-security-center (for TPM/FDE)
-    snaps_from_dangerous=(snapd-desktop-integration firmware-updater desktop-security-center)
-
+    model="${stable_model}"
+    # If we need to override anything from the model, we need grade: dangerous.
+    # And if so, uncomment the below to use the dangerous model and set the
+    # snaps_from_dangerous and snaps_from_beta variables to still use snaps
+    # from the stable model.
+    #model="${dangerous_model}"
+    snaps_from_dangerous=()
     # For these snaps, we ignore the model entirely.
-    snaps_from_beta=(snapd)
+    snaps_from_beta=()
     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
-
+    if [ "$model" = "$dangerous_model" ]; then
+        for snap_arg in $(get_snaps_args_excluding "$stable_model" "${_exclude[@]}"); do
+            prepare_args+=("$snap_arg")
+        done
+    fi
     for comp in $(get_components_excluding "$stable_model" "${_exclude[@]}"); do
         components+=("$comp")
     done