From d6443ce2897606fa02fceaffb35d8b07249b4d21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?=
 <lukasz.zemczak@canonical.com>
Date: Thu, 18 Apr 2024 18:58:17 +0200
Subject: [PATCH] 24.04 model assertion.

---
 debian/changelog                              |  6 +++
 .../hooks/020-ubuntu-enhanced-sb.binary       | 48 ++++++++++---------
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 84b9b4af..422abc6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (24.04.64) UNRELEASED; urgency=medium
+
+  * Update the Ubuntu classic model assertion for TPM FDE to the 24.04 model.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Thu, 18 Apr 2024 18:57:28 +0200
+
 livecd-rootfs (24.04.63) noble; urgency=medium
 
   [ Simon Poirier ]
diff --git a/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary b/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary
index 109554a0..d5635cd0 100644
--- a/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary
+++ b/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary
@@ -20,14 +20,13 @@ fi
 . config/binary
 . config/functions
 
-# env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 brand-id=canonical model=ubuntu-classic-2310-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: 5
 series: 16
 brand-id: canonical
-model: ubuntu-classic-2310-amd64
+model: ubuntu-classic-2404-amd64
 architecture: amd64
 base: core22
 classic: true
@@ -35,12 +34,12 @@ distribution: ubuntu
 grade: signed
 snaps:
   -
-    default-channel: classic-23.10/stable
+    default-channel: classic-24.04/stable
     id: UqFziVZDHLSyO3TqSWgNBoAdHbLI4dAH
     name: pc
     type: gadget
   -
-    default-channel: 23.10/stable
+    default-channel: 24/stable
     id: pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza
     name: pc-kernel
     type: kernel
@@ -60,48 +59,53 @@ snaps:
     name: bare
     type: base
   -
-    default-channel: latest/stable/ubuntu-23.10
+    default-channel: latest/stable/ubuntu-24.04
     id: 3wdHCAVyZEmYsCMFDE9qt92UV8rC8Wdk
     name: firefox
     type: app
   -
-    default-channel: latest/stable/ubuntu-23.10
+    default-channel: latest/stable/ubuntu-24.04
+    id: k1Ml1O9GzSO2QftV0ZlWSbUfQ78nN460
+    name: thunderbird
+    type: app
+  -
+    default-channel: latest/stable/ubuntu-24.04
     id: lATO8HzwVvrAPrlZRAWpfyrJKlAJrZS3
     name: gnome-42-2204
     type: app
   -
-    default-channel: latest/stable/ubuntu-23.10
+    default-channel: latest/stable/ubuntu-24.04
     id: jZLfBRzf1cYlYysIjD2bwSzNtngY0qit
     name: gtk-common-themes
     type: app
   -
-    default-channel: latest/stable/ubuntu-23.10
+    default-channel: latest/stable/ubuntu-24.04
     id: gjf3IPXoRiipCu9K0kVu52f0H56fIksg
     name: snap-store
     type: app
   -
-    default-channel: latest/stable/ubuntu-23.10
+    default-channel: latest/stable/ubuntu-24.04
     id: IrwRHakqtzhFRHJOOPxKVPU0Kk7Erhcu
     name: snapd-desktop-integration
     type: app
   -
-    default-channel: latest/stable/ubuntu-23.10
+    default-channel: latest/stable/ubuntu-24.04
     id: EI0D1KHjP8XiwMZKqSjuh6W8zvcowUVP
     name: firmware-updater
     type: app
-timestamp: 2023-10-03T12:00:00.0Z
+timestamp: 2024-04-18T12:00:00.0Z
 sign-key-sha3-384: 9tydnLa6MTJ-jaQTFUXEwHl1yRx7ZS4K5cyFDhYDcPzhS7uyEkDxdUjg9g08BtNn
 
-AcLBXAQAAQoABgUCZRxdbAAKCRDgT5vottzAEhE1D/9tkrF4Zsq3YI4TpnNrXIlRoA8xF8E1ldPQ
-R8J3HTs85/VudYEg4yhnfny9NwngSUHYPrUdMDPlG03QF+hsp5jMcTCnHnwWaHAFTmSp4YlkKww/
-cBn8NAEKni9JL9K1y8A7fMUxojZ3QV/XI3fQl/cuLrWb0MJNl/aaC740DINqY+ZGaRwjPD/RNiGg
-iD90xDn2it0YMOw1qe/tg8EKNe45PXDKUARc3tL8vYVmzSXLkUMwjJeZMRR3LcUWeFLFrctOXnc3
-EFFp8r2WDssdGbgI1qHp4lGykbHH/yE0f3g+eBWv7etogmmOVqwoCp9+rYn6LbyW6aNY8Gcv77ak
-DuSaJwiGkkxaCtb3CnCj6i+YVn55DVBLFEgfGBL7/yVtCSfcNYYAgjFa3cEz35pwtLQ47R5c+wwD
-VQ47fVL1VdWjQ2HHkbmhUq9OgkjdadLRuqrX2u64ZcO69sP2uQAjhYdd62rR4A8L6mF4dQ/99kTE
-3x9ivIhQkBXh6hzBIdDDx0OcWS/Ia7DsM2QXYRtgfE0tgRmflxWjSVGuCUUHE/ZL+7h/fCeylAxz
-QtDdGTG8gi/RhIyXdgfQXUGwOyKl7EgRYenhH0wQngc6PsZKE6vQNyV7CFESRbgReQJ4bmCEuiDW
-/mJmiy3rAhZHfq8Sz9+jj44zTzqf+2ZZ8tDze4gyZw==
+AcLBXAQAAQoABgUCZiFOmwAKCRDgT5vottzAElKsD/0cF2oweMQA4Nmmb5blGsKXD9pCYkF1qeU8
+oD8lC6TOEw0T0BFUqj9sqed2yV8chljfFmKy6UNVRQ4fWnOBnZYyQoAyNbTlJf+euGpNIu0gqwDh
+VTvH3zMCLgVwfpmUu8VDV1On31o85NZ2Jo3IiQ0+QhOx20t1x3iOhqvB91uQdMIBzVQiHMWpvdsK
+mX5/e3kt4Vnb10RE2iHtyBm4O4r8KQPayX2G48ZPnF84FtADNzhbVThzvT7agjXXQLrzhU4sk1lx
+5mFrBxvZ7yIJqhKzRUUWl0j7SXjOEVBVzJ1VZENwIb7dN9dsHqtN7DCiI2VMKkz2HbGmrgPtCHpm
+0ZOCs9SO288NVVJ/5wiVET6OoWRDiuQqtc+P7mmhkHZCpb/oekICztLUDFOnX2N21lQDNk5UEUr9
+HSR8QxTJ2rCuPcOKizGI98eGYRJkTtRUPeCd2sNO+iCEooWy5qEMmh4oCs9/4ofyNw4O7FS7XmlK
+lbnXCBGg643d8Gx5CwbRgnz6p6wBMfDFIDHci8XralovNGpZ+oSL7mFGmgX9w8Ps9wdrxbBML76T
++SpPauzCXUXMsRerZI96jkhAOyGsMN+7bZnZmm7PeReRSg0i3ZAtFxbjtAwNEXhzsxt1v7EJwF35
+4jGYvZlIWaeGFVoeGWbKrzKtvc+KzR3HfTsBUWYeOg==
 EOF
 
 channel=""