From c52559bc094c75cc9508066ecddb362b4eaaab74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfonso=20S=C3=A1nchez-Beato?=
 <alfonso.sanchez-beato@canonical.com>
Date: Mon, 5 Feb 2024 13:47:04 +0000
Subject: [PATCH 1/6] ubuntu-core-initramfs: change name of plymouth plugin

Upstream has changed the name of the freetype plugin from label-ft to
label-freetype.
---
 bin/ubuntu-core-initramfs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/ubuntu-core-initramfs b/bin/ubuntu-core-initramfs
index a5c31a49..5062e0ab 100755
--- a/bin/ubuntu-core-initramfs
+++ b/bin/ubuntu-core-initramfs
@@ -419,7 +419,7 @@ def install_misc(dest_dir):
         "/usr/bin/partx",
         "/usr/bin/plymouth",
         "/usr/bin/unsquashfs",
-        "/usr/lib/" + deb_arch + "/plymouth/label-ft.so",
+        "/usr/lib/" + deb_arch + "/plymouth/label-freetype.so",
         "/usr/lib/" + deb_arch + "/plymouth/script.so",
         "/usr/lib/" + deb_arch + "/plymouth/two-step.so",
         "/usr/sbin/depmod",
@@ -446,7 +446,7 @@ def install_misc(dest_dir):
     proc_env = os.environ.copy()
     proc_env["LD_PRELOAD"] = ""
     to_resolve = [
-        "/usr/lib/" + deb_arch + "/plymouth/label-ft.so",
+        "/usr/lib/" + deb_arch + "/plymouth/label-freetype.so",
         "/usr/lib/" + deb_arch + "/plymouth/script.so",
         "/usr/lib/" + deb_arch + "/plymouth/two-step.so",
     ]

From dbc53b04be7d7e16c42a97f328cd268fd704161a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfonso=20S=C3=A1nchez-Beato?=
 <alfonso.sanchez-beato@canonical.com>
Date: Tue, 6 Feb 2024 08:18:55 +0000
Subject: [PATCH 2/6] spread: use now available 24.04 image

---
 spread.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spread.yaml b/spread.yaml
index f7d4954b..aa9fc7ad 100644
--- a/spread.yaml
+++ b/spread.yaml
@@ -20,8 +20,7 @@ backends:
     halt-timeout: 2h
     systems:
       - ubuntu-24.04-64:
-          # FIXME: switch to 24.04
-          image: ubuntu-23.10-64
+          image: ubuntu-24.04-64
           storage: 20G
 
   qemu-nested:

From f719cad5c39a54a2a428f60e1342f2b763df3991 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfonso=20S=C3=A1nchez-Beato?=
 <alfonso.sanchez-beato@canonical.com>
Date: Tue, 6 Feb 2024 09:46:30 +0000
Subject: [PATCH 3/6] tests/lib: adapt to new OVMF paths on 24.04

---
 tests/lib/nested.sh        | 4 ++--
 tests/lib/prepare-utils.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/lib/nested.sh b/tests/lib/nested.sh
index a07daf6c..c0298859 100644
--- a/tests/lib/nested.sh
+++ b/tests/lib/nested.sh
@@ -122,8 +122,8 @@ start_nested_core_vm_unit(){
     fi
 
     mkdir -p "${WORK_DIR}/image/"
-    cp -f "${OVMF_VARS_D}/OVMF_VARS${OVMF_VARS}.fd" "${WORK_DIR}/image/OVMF_VARS${OVMF_VARS}.fd"
-    PARAM_BIOS="-drive file=/usr/share/OVMF/OVMF_CODE${OVMF_CODE}.fd,if=pflash,format=raw,unit=0,readonly=on -drive file=${WORK_DIR}/image/OVMF_VARS${OVMF_VARS}.fd,if=pflash,format=raw"
+    cp -f "${OVMF_VARS_D}/OVMF_VARS_4M${OVMF_VARS}.fd" "${WORK_DIR}/image/OVMF_VARS_4M${OVMF_VARS}.fd"
+    PARAM_BIOS="-drive file=/usr/share/OVMF/OVMF_CODE_4M${OVMF_CODE}.fd,if=pflash,format=raw,unit=0,readonly=on -drive file=${WORK_DIR}/image/OVMF_VARS_4M${OVMF_VARS}.fd,if=pflash,format=raw"
     PARAM_MACHINE="-machine q35${ATTR_KVM} -global ICH9-LPC.disable_s3=1"
 
     # Unfortunately the test-snapd-swtpm snap does not work correctly in lxd
diff --git a/tests/lib/prepare-utils.sh b/tests/lib/prepare-utils.sh
index 32751656..c6b3fbf6 100644
--- a/tests/lib/prepare-utils.sh
+++ b/tests/lib/prepare-utils.sh
@@ -77,8 +77,8 @@ start_snapd_core_vm() {
     fi
 
     mkdir -p "${work_dir}/image/"
-    cp -f "/usr/share/OVMF/OVMF_VARS.fd" "${work_dir}/image/OVMF_VARS.fd"
-    PARAM_BIOS="-drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on -drive file=${work_dir}/image/OVMF_VARS.fd,if=pflash,format=raw"
+    cp -f "/usr/share/OVMF/OVMF_VARS_4M.fd" "${work_dir}/image/OVMF_VARS_4M.fd"
+    PARAM_BIOS="-drive file=/usr/share/OVMF/OVMF_CODE_4M.fd,if=pflash,format=raw,unit=0,readonly=on -drive file=${work_dir}/image/OVMF_VARS_4M.fd,if=pflash,format=raw"
     PARAM_MACHINE="-machine q35${ATTR_KVM} -global ICH9-LPC.disable_s3=1"
     PARAM_IMAGE="-drive file=${work_dir}/pc.img,cache=none,format=raw,id=disk1,if=none -device virtio-blk-pci,drive=disk1,bootindex=1"
 

From c64a3f01ad2628c45aea164aafb9ab2ee13d4d7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfonso=20S=C3=A1nchez-Beato?=
 <alfonso.sanchez-beato@canonical.com>
Date: Tue, 6 Feb 2024 19:01:02 +0000
Subject: [PATCH 4/6] snakeoil: update OVMF_VARS to qemu format in noble

---
 snakeoil/OVMF_VARS.snakeoil.fd    | Bin 131072 -> 0 bytes
 snakeoil/OVMF_VARS_4M.snakeoil.fd | Bin 0 -> 540672 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 snakeoil/OVMF_VARS.snakeoil.fd
 create mode 100644 snakeoil/OVMF_VARS_4M.snakeoil.fd

diff --git a/snakeoil/OVMF_VARS.snakeoil.fd b/snakeoil/OVMF_VARS.snakeoil.fd
deleted file mode 100644
index e9d02bf8ac5b6fca542e7ec85eeafbe0d2f8cb62..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 131072
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
zfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}
z0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*sr
zAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_0
z00IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@)gTab=fKxSJvAjNXMeJ|y8PCc
zgVzU-xF+*G;V1N=8a6=|2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*sr
zAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_0
z00IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@
z2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000Iag
zfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}
z0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*sr
vAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IagfB*tFfWUtNZLxjs

diff --git a/snakeoil/OVMF_VARS_4M.snakeoil.fd b/snakeoil/OVMF_VARS_4M.snakeoil.fd
new file mode 100644
index 0000000000000000000000000000000000000000..289039cd42cb4e47513cde0bd9be6277802f8c35
GIT binary patch
literal 540672
zcmeI)378edodEED^M*?l5Jn6d6lE7lKzASt(V%i4atR3H0TBU_m1_}*#tYG)fk+fQ
zfJlHPA`%cm*^ej^v#{%;!NB^dQN!w@MiNOB_0!d;vsG{Ak;!Bp^AHqGem!4Lzv-^7
zuKIQNzq{*IPm=uQa7&BbC3jAl+3UXVozShu1%1y>+Skk^_;%Mp-Ag_xOu8ql)`b}b
zH^#a3GK(_5u4wtr@~dv2-)ZsGlZyIm{LbukCF$h+PfC|BAJ{HQ|2b);pBjd_sW2Y8
zYszEIC(P@#XyU*8@xsnC7j{Y}CzmIalJUvdq<8o|A{iOiFIhhD%;bdlX)i;au&gkQ
z<6hhF{BI^d-{Ya@)}DM^-QnLI9`cwN@*I&|T$Z9F<kv1~x|h7-qNBnX%lPuEm*2YU
zqH#UvrF$LUu36o7gF=4eLT=+ju06x&D?^F<BvWGQOgU?WPkS4pa4hHH?I*lZQ1tZS
zv%Zro+B|yVw|Xb%B%Q+ixXpYFo0p|+_-wbH&o1lVWkKg(t~{x3uMc{J(v1%F9i0qI
z#v~oWr%9odW0MJC+BcLrnof-CmPCg$tK3&bA#I~j;4VE{pVxWUVZBywS+M%lmuejP
zmpL~{T7`6fHN?tfh7OY^jT}2+Qj<zkWfL8w>H0$t(uTi0o84K}8U5v{$^kFwo@4xg
z=lr*mVJ6m8eO-t#tssn_I;IsI*qGM3vON$Bm>IG$t<qH4L<eaqrd0_qrsXCQ({kHn
zm+V7Ki&xK2AJftY^gity+47g4?zy~YV_K!D%CB({K8tBpqKj#{iNv(rHrXZn5Yyr_
z?0&?w!UOs2d2+V=<)^WLnIRj~DovG5bdaWET9xo(T5cjSEw@c}$v(uiYGIxIiD}g`
z+d6P<YNurDP<|Q<nHjQit<qH4L<eaqu2l&yuH_~Y*K*rrm+V7as~*<bueetIz_zQk
z$=0F#G!`;5WaC<;sj`U<(o|fl5?)-(O(d@6w#hEphqxBMYu&%NR^x!St+mb8q5O2u
z7sA=NR%xp8YaE2n;#!sH;#zJZaV@t^c1fPkhVeVl*hgeP<66xF*}nG8Y#qu^V<9s`
zHm+5gDx2saO~th;;l;JwMB-X*o9vRZ`?Wo{IobIYrm-Jc>^d>*rB`P@G3UPzUw&Bf
z^4xTbA9M^o>Bd*+n-;qK<<*z2e#q~Pz2sS(l>Q`1t*|FsCIdsSxDKHw+=Q@BVU40>
z^P}soe&hd6?z{Z=XS}*<WW&XU)r*qjmbdI$G$q~ThH*3g?cGb7wz{sQF!aYeGpVY6
zv3q1?^*bkQb8P5yH$L=joD|aJTesN%Fn%pt(d+Ect8ZAy>5@zj#IZ@Q@YlFxR7g2;
zTwu$~?U0Z<emzn#@A7$#%5xuN`$_J+?!m(Q->cpI(P!E||AV35Up^?5YhuzRj1w~@
z?V2ffEN3iZyDB|nr@Z4UDPyOQ+qfk5atz+7LzAr?(y=;8Dis<KjxC#$`93@Dx%{>j
z`;PVqV?~eBZS^hNbGf#b%CyL)>okbPNRodq4H`95sq`U5$+L@&Sh;KFug+R@`PRm-
zUwh)snL_1T|I0#lm6s{6`lkwW3Vk+Z&gEEo6dWAKSf<%I9S>}o_6i;ki+wmq@;yc#
z%2~J1_Za!S>z-@Beip~t=UulL``-Cm+phsJRalh#==}4i4_Vi%+l>Q9ZrgBU&mDVC
ziBR9NVZY*LJTA6{vGTb21wG#nvdtIzocWw=;yG6kVsz!l&6hNm?x$T?JzckUysIop
zr&9ZNKehYs>>MnkUfgujz@H8u(|*IXw{2NpbJMv6>CjG+PE9Sl@5}EwBF3<a$6@Ka
zMt^>y2}#=bd+x4<;Vr80F~9r%_>59j-eqs-l;wS7S>9FOug84Xgt20|KZ|?lV4eGB
zd|&Rf^4MwlJp0AEe>v|lt3Dp%(X}z>e*N;s#fpJ#fA;ei`udq^zo`2BjqNj)wFy+-
zK9kC;O(eF@jH~3>$>v!a&0@rfCvB6^KGP-X8lJ?PB>lpt-r?^i;T_ZtN&lpC`00@h
z2ya}*WxdPVb&A7VhfTto6@x*+vFZA;QJ|zGNn+sbv!dqphc7&@_xI}TII4fk^Va0^
zY!y9XmxPM(EL-;S?^4F{7vvd(qsidC<XdXeI;2R2vE?3-c&5cSIVXl`e6zDj(6}`G
zJtq9*Zq2&kp2Dlo`0-c!t{nMt|4X+%v@QQ@c&vYH;?KYS>2OS(US+#ZtbhN#<Xc+*
z`2Im@{kw%4PY&<yHc7JbV?qnius!dw=4!`l+3NnaGuE%}boa$?tZTM?NR3$Ye9HG}
z_xqk#C_>3A8(M~$#bI1n*r-?A4o~;KyWY&ZmYw<WhrPo-9Ght&yE421d}U~x9GPj|
z%C_&tw!YDsHm@X!$Mn=N)(T^EjKkD0W*VRZS3F+(ght4CosUC2&Z{cdzP*cG`i}Dn
zrP*hG@2pW!z5ely%FQV)$Ejh%Pp)b7+-axZ*=5Q47q-?JHFA9EJJ^fQd+eT9Z@>4f
zo7VpHhznc1H8G})L*p=Avh3kSjSH7`Uw_lavGtE0dV2A+bgklPsojgx1*w99q8@8H
zK6_)wf9(37b80+$%;Tvm=WlC#SMg!hYkhrs_v!B+mP*yGmJ}DYs$X2MdU{~tA&1r)
zFmBjoBb)RcJ*N1WBM)nJYO7Yoty;G(Zhgur=V$(Gz30yyYfVcXUq1WLYL=dss+)uo
z9a1nYl}fg>|J@16J9TF7e6hvAF3nH;xY}(O_x<%P_x|jfN0!WZ;gRiAYOiZ^?Z=}&
z7_j1Zr+&0>%XP24*7%TG-#&L($1bltR5*9*y^H_(qV1c8bX~vUH~qh|_W3O>hE7f`
znEB=nH}BYZ<TLlxZ}7^oBL+8acW$!}uQ{n%;Yp7+tiE~rZ9BJ57+3$g7n;r*yK2Rl
z6?b2{Z00lXE}605?)#5>tfbF{!@k~Za_3K0p3*2;J)~CcSp#++x%;Ta^WNLJyI<k1
zCp!Pnci%kbrh3Ww!#3Ys{p~gjX4Pyxx6iKjUAwM0YSyZB`j{3MEWQ4g+jq1Xxb32U
zn!By}RoA~Uc-rir{I<tsvv&-7s@}Y%4=x+lankFLd^BU%AGRDmYEkk|i?s#mRFYaU
zptxUg;~?I+PGQ5sqM|dN8uI9z-)~&A`lz<kPha@l?RUNP!{TG(;--aPDQ-Bm@&t8b
zf(EHnNny3(@T^f%o;~c<z@AD@xxK^51J4<F$I$6>-*11(i)Wp7)gQ+mv2*^Wi?6-^
z<13!*d_hs$I^Ax%_MBRcYuvhY(u8#_&RJUW&ha0fxU}}Ev)0s2RU7<d&!NXn>G}Pg
z-+JPO`qdszKk)cv)!!RFz4s9f)-7t(`n*SmymZe={oY;i)Ry@_@6+xV8+v>)XXxaj
z)o=aqKW=V1=;6^1E^XiKSB=|jZ`<?qmyVs^WBMO%9evi*lZKaUYB2SQ-n)0FYhSr>
z?Sc_QI}d;RrZZ-Y>h{{~l`pRBJni8vXa4-dxBqqewqK8Y_{~2(@U<4}`+Vc0%{%*!
z@7G}Ix}80@PkX=hj@N&?c+-XkCtvZ)&IM=R+kIY_+fv{B_=x|lb7zlX4_)>6D_idz
z+<eLPA6{@x`l?LZepTmQjM=@ySlPLEMVQ~L;ig~oI(v5e758=cpv|04&12d)#Mo5v
z?0e;bO&#Zc^wpyIe|q=7=8gZ^Kb&xXhgV1ZXil%6+%fOyEBdb+81I?#DNj7ZD_%!>
zhAUgouuaiGH2AA<AsXZn4N9N+t2+PUJwavX-`Q23eHG7G*J9V=c!%X$oV^w|4d>S0
zhU|Ca`Tq~0(*Jc-c0-&q>-fERd^&o(_L8@1t{T*3-ln8pt<9%(9uS@#hKHx6iD8<3
zTI!N{Uc5LwC60`1W$q!W%75RU2{P@&v5nY3fB*pk1PBlyK!5-N0t5&UAV7cs0RjXF
z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U
zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7
z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N
z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+
z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly
zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF
z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U
zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7
z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N
z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+
z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly
zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF
z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
z0RjXF5FkK+009C7@)BtAwZT8W^y+JREP85W^6|o>?`XNI<%mzhnlIN)GDBXONJM}D
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U
zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7
z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N
z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+
z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly
zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF
z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U
zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7
z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N
z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+
z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly
zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF
z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U
zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7
z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N
z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXFe69lj
E4@l${00000

literal 0
HcmV?d00001


From 717aa917059519747093e3c273f5a21e66b1144d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfonso=20S=C3=A1nchez-Beato?=
 <alfonso.sanchez-beato@canonical.com>
Date: Tue, 6 Feb 2024 19:35:06 +0000
Subject: [PATCH 5/6] tests/lib: use now channel 24 for pc-kernel

---
 tests/lib/prepare-utils.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/lib/prepare-utils.sh b/tests/lib/prepare-utils.sh
index c6b3fbf6..3ef0d412 100644
--- a/tests/lib/prepare-utils.sh
+++ b/tests/lib/prepare-utils.sh
@@ -152,8 +152,7 @@ download_core_initrd_snaps() {
     curl -o ubuntu-core-amd64-dangerous.model https://raw.githubusercontent.com/snapcore/models/master/ubuntu-core-24-amd64-dangerous.model
 
     # download neccessary images
-    # FIXME: switch to 24/ channel
-    snap download pc-kernel --channel=22/${snap_branch} --basename=upstream-pc-kernel
+    snap download pc-kernel --channel=24/${snap_branch} --basename=upstream-pc-kernel
     snap download pc --channel=24/${snap_branch} --basename=upstream-pc-gadget
     snap download snapd --channel=${snap_branch} --basename=upstream-snapd
     snap download core24 --channel=${snap_branch} --basename=upstream-core24

From 431aa2ef9ea35482e3b10ef7b12ee33dba57517c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfonso=20S=C3=A1nchez-Beato?=
 <alfonso.sanchez-beato@canonical.com>
Date: Tue, 6 Feb 2024 19:41:38 +0000
Subject: [PATCH 6/6] tests/lib/prepare-utils.sh: make tweaks script more
 robust

As ssh might not be active yet when we ask it to reload its
configuration. This provoked an initialization error so the
"Initialize system state" change had to be retried, delaying the test
around 7 minutes.
---
 tests/lib/prepare-utils.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/lib/prepare-utils.sh b/tests/lib/prepare-utils.sh
index 3ef0d412..7a5e2c48 100644
--- a/tests/lib/prepare-utils.sh
+++ b/tests/lib/prepare-utils.sh
@@ -326,7 +326,8 @@ echo 'ubuntu ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/99-ubuntu-user
 sed -i 's/\#\?\(PermitRootLogin\|PasswordAuthentication\)\>.*/\1 yes/' /etc/ssh/sshd_config
 echo "MaxAuthTries 120" >> /etc/ssh/sshd_config
 grep '^PermitRootLogin yes' /etc/ssh/sshd_config
-systemctl reload ssh
+# ssh might not be active yet so the command might fail
+systemctl reload ssh || true
 
 print_system "done setting up ssh for spread test user"