From e8d5fde9e2d7933c4ff8525437a76a9112fba561 Mon Sep 17 00:00:00 2001
From: Utkarsh Gupta <utkarsh@ubuntu.com>
Date: Mon, 30 Sep 2024 16:15:08 +0530
Subject: [PATCH] Revert "Update the model used for TPM FDE installs."

This reverts commit c4e69348aed2e89bdef0187afe79da18d855eb8c as
the more debugging is needed for autopkgtest failures and is
therefore blocking apparmor fixes for cloud images.
---
 .../hooks/020-ubuntu-enhanced-sb.binary       | 71 +++++++------------
 1 file changed, 26 insertions(+), 45 deletions(-)

diff --git a/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary b/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary
index 5baff6d6..8c589a4c 100644
--- a/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary
+++ b/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary
@@ -20,13 +20,14 @@ fi
 . config/binary
 . config/functions
 
-# 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-2404-amd64 > config/classic-model.model
 cat <<EOF > config/classic-model.model
 type: model
 authority-id: canonical
+revision: 3
 series: 16
 brand-id: canonical
-model: ubuntu-classic-2410-amd64
+model: ubuntu-classic-2404-amd64
 architecture: amd64
 base: core22
 classic: true
@@ -34,12 +35,12 @@ distribution: ubuntu
 grade: signed
 snaps:
   -
-    default-channel: classic-24.10/stable
+    default-channel: classic-24.04/stable
     id: UqFziVZDHLSyO3TqSWgNBoAdHbLI4dAH
     name: pc
     type: gadget
   -
-    default-channel: 24.10/stable
+    default-channel: 24/stable
     id: pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza
     name: pc-kernel
     type: kernel
@@ -59,68 +60,48 @@ snaps:
     name: bare
     type: base
   -
-    default-channel: latest/stable/ubuntu-24.10
+    default-channel: latest/stable/ubuntu-24.04
     id: 3wdHCAVyZEmYsCMFDE9qt92UV8rC8Wdk
     name: firefox
     type: app
   -
-    default-channel: latest/stable/ubuntu-24.10
+    default-channel: latest/stable/ubuntu-24.04
     id: lATO8HzwVvrAPrlZRAWpfyrJKlAJrZS3
     name: gnome-42-2204
     type: app
   -
-    default-channel: latest/stable/ubuntu-24.10
+    default-channel: latest/stable/ubuntu-24.04
     id: jZLfBRzf1cYlYysIjD2bwSzNtngY0qit
     name: gtk-common-themes
     type: app
   -
-    default-channel: latest/stable/ubuntu-24.10
-    id: IrwRHakqtzhFRHJOOPxKVPU0Kk7Erhcu
-    name: snapd-desktop-integration
+    default-channel: 2/stable/ubuntu-24.04
+    id: gjf3IPXoRiipCu9K0kVu52f0H56fIksg
+    name: snap-store
     type: app
   -
-    default-channel: latest/stable/ubuntu-24.10
-    id: ew7OxpbRTxfK7ImpIygRR85lkxvU7Pzt
-    name: gnome-46-2404
+    default-channel: latest/stable/ubuntu-24.04
+    id: IrwRHakqtzhFRHJOOPxKVPU0Kk7Erhcu
+    name: snapd-desktop-integration
     type: app
   -
-    default-channel: 1/stable/ubuntu-24.10
+    default-channel: 1/stable/ubuntu-24.04
     id: EI0D1KHjP8XiwMZKqSjuh6W8zvcowUVP
     name: firmware-updater
     type: app
-  -
-    default-channel: 1/stable/ubuntu-24.10
-    id: FppXWunWzuRT2NUT9CwoBPNJNZBYOCk0
-    name: desktop-security-center
-    type: app
-  -
-    default-channel: 1/stable/ubuntu-24.10
-    id: aoc5lfC8aUd2VL8VpvynUJJhGXp5K6Dj
-    name: prompting-client
-    type: app
-  -
-    default-channel: 2/stable/ubuntu-24.10
-    id: gjf3IPXoRiipCu9K0kVu52f0H56fIksg
-    name: snap-store
-    type: app
-  -
-    default-channel: latest/stable/ubuntu-24.10
-    id: HyhSEBPv3vHsW6uOHkQR384NgI7S6zpj
-    name: mesa-2404
-    type: app
-timestamp: 2024-06-18T12:00:00.0Z
+timestamp: 2024-08-26T12:00:00.0Z
 sign-key-sha3-384: 9tydnLa6MTJ-jaQTFUXEwHl1yRx7ZS4K5cyFDhYDcPzhS7uyEkDxdUjg9g08BtNn
 
-AcLBXAQAAQoABgUCZvMlswAKCRDgT5vottzAEnrhEACCJBds2bVoEzHcrMD+NRW+D6RgrJrdCHv4
-Z2pepcgXIAAniKIRf3VRw/whWbC38Kyhy8nMYlKgbyBcxLHa5yolpl77ZSk60Wba6/sQ2Xuni0/1
-Yx8h/F/VffI1efqHy1crT7hJ/zM46FqxlkIujCIWAXZ8yEUxJu6zfo5sWYSfwOhe7TbIO3yx37Rw
-hNb2ZcG4kDTPlJLVxKxc/j7pM82ZSROj3lp7J2PNfIC/MNUsGEnIRGKM0wLZHfdKOtfVc2xL+GyN
-9YXWITOjQtnpNdExHXabsqlU3zbGIA4SDeG1MwNn7B/tBAkrP7zEkd6VJKaGmmoc3VVPiVxTaLMm
-Ao6E6ET+wostQ2GYLjGAz2jYQykufGkoxIlj5gS8aTePIvKfFQGaRWPoVo7kxzYnoYAq9BqgXln6
-1nJFsKCQ1LZ16hF+moPOjSSq3BY0EYKdDEKz0dtopt1JcvFONfoel3mfCXkgS9qjAD6o+6baslrX
-lrgvQyiXrevpzQOJVIp5ohx4cYlr3kSHnMzx873KMnEkFDRqITFR8gP7Tu4wClLw6Ubg85wlJSRH
-HclYJNer8IFGLYQdOnYqIximRYWan4eAT3AnMdhiI2QEi0NdiILinPJEacIqf6Q8IxHm1Jxsc2fe
-TbbmksEGmZz+u5u7omHphYLqhp9kRXCtSWdIOamyEw==
+AcLBXAQAAQoABgUCZsyysAAKCRDgT5vottzAEilHEACwNTjGEIAfePAkgYeaWvNvQXTIHRqa/fc8
+G7BJZQJjvE8I7DMQn5QHqUHpLTvyKQCch780R43NbNmcEWBSvYe7vdfSGwF4acyP6MBk7rO1s366
+lBjvKEkhk1yfcpx3cGUy+LWsLvJkRYvAC31vMCcVnyXZGzAFT0qDlHOH5J3UHc7JBmuo9rdHueKN
+KmjgozFp6NAPFFGEA4yqIqBRUtZyu9r27SvI2AqY+TKZClzUvaxxUOpCMTZmF8nMC9ucLRstSHbf
+BGUvaIo97xY0ycG8QHFXEG1iOsIhUq2pGgIIajCxL+A1uwvGuGRDHscb0g63MvfqJB3lIsKy/oTU
+8KgAIOG2Qy9AhwkP1kMuBh5Txw4XMp4lNmPpBToOIQK+LAmDup82+czcvTdDRVAmzq3gGMeSwzc8
+hwq6uMLbI+jl67tHhhItOAMF5UzqWetecA81OEvyLxNSYcLIJ2zbXwRaOTummnIFgg6RDPBwd0tl
+K8EVLVIakCQtKs/2tmBMWXuv2HStqoUsn+8I5ofzVv/gJnu0cD1xvLTJ0xbK4TnTmCYDP8b357Jg
+MXOLyKFuNLcaf1mR7vwsE3570jsFUQtwq8CYWZD5WCCVv1QXb2MKD3A1fEgAHMqRfHSa+HoPzsWY
++KDM/aLgtd0I8R7pQdz1GO2vkxz5BAv7jG5kvwhuYg==
 EOF
 
 channel=""