Refresh the canary model assertions.

debian/changelog

@@ -1,3 +1,12 @@
+livecd-rootfs (23.10.18) UNRELEASED; urgency=medium
+
+  * Refresh the canary model assertions. The live model now includes all the
+    snaps of the standard installation (including firefox), as we want to offer
+    the same experience in the livefs as in the target installation. We also
+    track other, proper channels for the seeded snaps.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Fri, 18 Aug 2023 17:49:09 +0200
+
 livecd-rootfs (23.10.17) mantic; urgency=medium
 
   * Merge the minimal and standard layers on the Ubuntu Desktop images

live-build/ubuntu/hooks/020-canary-enhanced-sb.binary

@@ -25,6 +25,7 @@ esac
 cat <<EOF > config/classic-model.model
 type: model
 authority-id: canonical
+revision: 2
 series: 16
 brand-id: canonical
 model: ubuntu-classic-2310-amd64
@@ -40,7 +41,7 @@ snaps:
     name: pc
     type: gadget
   -
-    default-channel: 24-hwe/stable
+    default-channel: 23.10/stable
     id: pYVQrBcKmBa0mZ4CCN7ExT6jH8rY1hza
     name: pc-kernel
     type: kernel
@@ -97,16 +98,16 @@ snaps:
 timestamp: 2023-07-18T12:00:00.0Z
 sign-key-sha3-384: 9tydnLa6MTJ-jaQTFUXEwHl1yRx7ZS4K5cyFDhYDcPzhS7uyEkDxdUjg9g08BtNn
 
-AcLBXAQAAQoABgUCZLa6ewAKCRDgT5vottzAEu9jD/9dfuMX8kDWrEaaiv+3g6GB/xEuhHkVStOU
+AcLBXAQAAQoABgUCZN94uAAKCRDgT5vottzAEsahEAC4oL47eK46gqSIE/enKgWrg1LCg+hP6ebL
-5c+7M9wB19BQrIhKCbYnNNGLJrIJj1DDThwCK+/L43NiiuolEDaTAGbKPxw7BhCMitnX9i3fxkFm
+fz/JoNduCsLR9JkJtFL4QoqLPqD/KQ+CxpSRUkewvY+QyoeHbJHBa3B9dWM6LGMtvZFIgKNWmqHB
-WaAsc667Fi9QVTb7XFKrzUiU7cwmqCI0ZjAn1fx8zXutRPISKw8fQaL8Acv80lNSWL5dyyJ1gtvC
+J/lMMlmzlerGOj6Yi2qipW6pS9xU2BEErZGqCUsiR1qaQnqkJjLJm6ygPOEuuOVgdq5H+pv10Wvl
-jMGVbD8R45pF+n8u5sNQaRweYayNv+TFAJDquGxP3Cuu0DYiO3SzsBpg8BV9siqByOshO+93DCaM
+gRTSlUYW9wzs6vt1r9/r2a06m7pYp5zWXRS5+HTAxfnL3iZwvtOlMH+Hwr2ZCZjSMpuz05uuweak
-8Vl3RFPGdY+M+kJsoI3GBHlZ3K+Hl1biVPpfm74T5DXQiLAxzs7iPgfqGC0QwRdzxHsNCETZrVAn
+sVtbLqXB5W5zT1s7RH7xZ9Ba4RwyFZZB4omv9aDwc+EtNMKjhGRzIBkAUjU4KQwyiDVXD5dVtWUP
-PzRDiagJSQWgAB1/zUVDgHIOw52OmHrTavwK7/p983na/HhVfU0rV3vZ/Ve6XsTryoOZ6Z31ygc4
+PxTOowURNgnbICtf+p5sVWSYjwl9Z05Q6D/e3humQ/sXkTU5kIGdnI/W9O7A+n/ttBHIQ71EscnH
-NiAtm8z7rRSsehR3JdykrtJziaE26lph9gl3QgdSYnfOGB+IOUt/Y6jf9hcAEIXqCMVKoiL2ynlp
+s5teT1wjbxk4OeHwINuma/ktQt6bMoWrOiRZAm//qW7599lOJKr7TEL3aA3oT/RES0SswQ0XAGEs
-G+nrcV25FfId+FDjezbfvPGe71fsjVZyL4ReQPCZRyCBujcASsn7sitZTuiZzYX8L9Uwl4baO6/a
+j7qO6rAERTYB2zO8OAUnL2vAUoTKa5G+WP3B9brrI1UaLHaDZUWg1kjubZzkeBLNdyoNFna8OInO
-dRTqQ4onOgta0LnuGFoIg4ifs7OLcyZmuQUoVR8a8IwNvq9/acYZ/uoYBUwWpzkqF2i1Wc8t+zvx
+YGanAa0HbNj/oM94GMwFKPFTeyNfGgdEprJgqwetDRc5FndSefquUdLRhrQG+ophqKz2ehSRMsZL
-uqvrEaWLoj9oa4E+956QJLGfn+qwSNeURdfkjAoPnA==
+OSI99bh1PCSxmNargEoWv/sXFGgLcbLOjd3gv1fTvg==
 EOF
 
 channel=""

live-build/ubuntu/hooks/020-canary-live.binary

@@ -25,6 +25,7 @@ esac
 cat <<EOF > config/classic-model-installer.model
 type: model
 authority-id: canonical
+revision: 2
 series: 16
 brand-id: canonical
 model: ubuntu-installer-classic-2310-amd64
@@ -46,23 +47,63 @@ snaps:
     type: snapd
   -
     classic: true
-    default-channel: latest/stable/canary-23.10
+    default-channel: latest/stable/ubuntu-23.10
     id: rQm0TtMOYOtEslvEXgxQDhgy1JNn38Wz
     name: ubuntu-desktop-installer
     type: app
-timestamp: 2023-07-18T12:00:00.0Z
+  -
+    default-channel: latest/stable
+    id: DLqre5XGLbDqg9jPtiAhRRjDuPVa5X1q
+    name: core20
+    type: base
+  -
+    default-channel: latest/stable
+    id: EISPgh06mRh1vordZY9OZ34QHdd7OrdR
+    name: bare
+    type: base
+  -
+    default-channel: latest/stable
+    id: 3wdHCAVyZEmYsCMFDE9qt92UV8rC8Wdk
+    name: firefox
+    type: app
+  -
+    default-channel: latest/stable
+    id: rw36mkAjdIKl13dzfwyxP87cejpyIcct
+    name: gnome-3-38-2004
+    type: app
+  -
+    default-channel: latest/stable
+    id: lATO8HzwVvrAPrlZRAWpfyrJKlAJrZS3
+    name: gnome-42-2204
+    type: app
+  -
+    default-channel: latest/stable
+    id: jZLfBRzf1cYlYysIjD2bwSzNtngY0qit
+    name: gtk-common-themes
+    type: app
+  -
+    default-channel: latest/stable
+    id: gjf3IPXoRiipCu9K0kVu52f0H56fIksg
+    name: snap-store
+    type: app
+  -
+    default-channel: latest/stable
+    id: IrwRHakqtzhFRHJOOPxKVPU0Kk7Erhcu
+    name: snapd-desktop-integration
+    type: app
+timestamp: 2023-08-09T12:00:00.0Z
 sign-key-sha3-384: 9tydnLa6MTJ-jaQTFUXEwHl1yRx7ZS4K5cyFDhYDcPzhS7uyEkDxdUjg9g08BtNn
 
-AcLBXAQAAQoABgUCZLa6iQAKCRDgT5vottzAEh+hEACxb8nNg/2yznOanHsCY69miFDHvxLf2AGB
+AcLBXAQAAQoABgUCZN94uAAKCRDgT5vottzAEvtpEACfnxMEKTBZPbwZxNEXA+W4zUIKLyZKNQ8J
-qeE+XJ9pyN05/JkvrDhODL0DCknFuvgo5kl+FhrS+mPdviytc3Ppm3kHSnPuwfzuO4t8PM1mRMOZ
+dnS4WoarMLqbAOHLPyWyHK/R5+Q9cxX1M+9SlR7oKwL/yP6eUMl/olsDMfv6+rGqg5VBLijkUSfu
-8djtgzbStKAzwKyYiK/pon4/Wtu1+6/tTp8Ji/pH12aRoFBub6mtQD81hC/xVxdcKz8KvzGsD5co
+ZoF8Cjev3lQfuuYqSXsZHQnz3SfMdL2RpXWSd0BuHeW96MG7uGLA9NM4sz5vbY+eVZpVC0LxFfeK
-H1TLfhKACVQJHZp7ErShkB6Ka6nVQy1c8/4sDPadKb2mqraIVMJmmHlYAHMfGl6f1dElheAjWXmz
+njAvCslALtcWChVig1IUTAPz22pEBpkQO6wEkjkccpsZLGwQSvYIpPX1HMLKvMo/LzX9Dxp/Xnlt
-0Roz4fh4lvjM0GmYTlsmhEj10F0pdwY/C2jB+6VFBJEZax65mRjs6Jaqxa150a26sOVFcMkS0ifO
+gcvwHTRHD1NO0qgrx5eKthXbbFTigxOA8l1hkhMM7p9trTXzHUchsKCjzlx+sdT9GfEzSqJsekH5
-pkB+KHrnilJ0/PyXZCoQcL65wTBEnfI0X/nzhvuE+9dXz5EUlusWeMvEhJ4QNOacCPARSd76M7QB
+m878xIMaP2UXhBNMZkXr8/vFxHsBdW2FMhJULNT8eyO+5C/I22/DwCFLJESqA5wA/hm8q5PH6tP2
-gUhMrz4Vf68V6tlfbXxgoEJFoVJo4i7gymMPnZDg0uAGQFYK+SSVEO/VtLDQvwRBU80IdA0kaIsn
+HOzbN9mxK7Y+J37JUFrLjz76ECxf/IVktTbDrBOvk40lsomlSE9VngFKbzxVHz7wn6m+lnqy4UDt
-afaqwYP8ACNPWpTztVYd/X6mvpdDz8MsW9pAEmJ4EN6JWcEu4ii5qXlzLK3s3HaCS5XNj+TpPEU+
++1QJr0GlzZYhJPccqqj9skdtkBdgTe2hogty8KsERneUpJ9wtV5UuOr2DU83Plh9yFjYhl4s7XGP
-9Nh9ePmCfE+KxR0cgfTbxP3KerYSd/xQHxgMLcMAGq20+1i/FmksKD6cSNYJRoqwTPwP+D9p42wF
+FjN6SMO3hL8nnoF7rANFTNMkyMl2IbyX4wfmi3pjAGubpQPDc00rc5KcwKdNwgAMB9XrvB/dEzKg
-3qGR3KEYbIij4hk/fZMCNzUEWt41OLLUVKm81oOixg==
+v0vszO82HG1XGXT8Em6DGLDTpyn7ABl0MAnjDFmLEw==
 EOF
 
 channel=""