Skip to content

Commit b5823d6

Browse files
committed
CI: undo mkosi.yml overwrite of systemd tools from main
The tools from main are no longer compatible with images built in this stable branch. Ubuntu 24.04 ships with v255 which is good enough, so restore those binaries. (cherry picked from commit 92df356)
1 parent a897e45 commit b5823d6

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

.github/workflows/mkosi.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@ jobs:
8282

8383
- name: Configure
8484
run: |
85+
# mkosi GHA clones and builds from main but tools are not compatible with this branch, 24.04 ships 255 which is enough
86+
sudo apt install --reinstall systemd systemd-container systemd-boot systemd-ukify
87+
8588
tee mkosi.conf <<- EOF
8689
[Distribution]
8790
Distribution=${{ matrix.distro }}
@@ -138,8 +141,6 @@ jobs:
138141
ExecStart=false
139142
EOF
140143
cp mkosi.presets/10-initrd/mkosi.extra/usr/lib/systemd/system/emergency.service.d/poweroff.conf mkosi.presets/20-final/mkosi.extra/usr/lib/systemd/system/emergency.service.d/poweroff.conf
141-
sudo ln -svf "$(dirname "$(readlink /usr/bin/bootctl)")/systemd-keyutil" /usr/lib/systemd/systemd-keyutil
142-
/usr/lib/systemd/systemd-keyutil --version
143144
144145
- name: Generate secure boot key
145146
run: sudo mkosi --debug genkey

0 commit comments

Comments
 (0)