Repository navigation
aboot: Discover correct ukiboot EFI vendor directory - #2623
Conversation
Johan-Liebert1
left a comment
There was a problem hiding this comment.
lgtm. CI is failing though
| vendor = entry | ||
| .file_name() | ||
| .into_string() | ||
| .map_err(|_| anyhow!("EFI vendor name is not valid UTF-8"))?; |
There was a problem hiding this comment.
We can iterate over entries_utf8
772c814 to
f8c80fb
Compare
|
The CI failure is because fedora doesn't have the new ukiboot yet and the new default vendor doesn't match what fedora uses. I've added a termporary workaround |
Sigkill? Is this some kind of timeout? |
|
@jmarrero-bot help here, check why CI is failing and make it more robust. Open a PR when you have proved that it fixes the issue. Also answer @alexlarsson questions in this PR. |
|
@jmarrero Usage: |
|
@alexlarsson Not a timeout, and not caused by this PR: the guest kernel's OOM killer killed On UKI the test rebuilds the ~122 MiB UKI. That's under oci-delta's default 192 MiB bsdiff limit, and tar-diff's bsdiff needs ~16 bytes per byte of the old file. So oci-delta normally peaks around 2.4 GiB and survives, but sometimes the Go GC lets the heap overshoot. It's rare: main passed 10/10 on a devspace, and this is the only such kill in that CI job since mid-October. With Fix: jmarrero-forge#13 caps bsdiff at 64 MiB in the test. The UKI then goes through rollsums, oci-delta peaks around 130 MiB, and the delta stays about the same size. It goes upstream after @jmarrero reviews it; until then, rerunning the failed job should get this PR green. Details: https://gist.github.com/jmarrero-bot/cef85960bc80160278b2440ebb86d112 Generated-by: https://github.com/jmarrero-bot#llms |
The composefs backend currently uses the ID field in os-release as the UEFI vendor dir. This works for fedora, but this is not generally true, for example with e.g. rhel/redhat. And, its important to deploy in the correct vendor dir, because that is compiled into the binary (to find the slot addons). If things go to the wrong place, secureboot will not work. So, I changed upstream to expose the built-in uefi vendor as a subdirectory of `/usr/libexec/ukiboot/efi`: https://gitlab.com/CentOS/automotive/src/ukiboot/-/merge_requests/42 This commit changes bootc to use this directory as the expected vendor name. If it is not found (i.e. for older ukiboot) we default to "BOOT", which is what the default ukiboot vendor name is. Also, the upstream uefi directory addition is done with a backwards compatible symlink, so things will keep working (sans secureboot, as before) for older versions of ukiboot. Generated-by: AI Signed-off-by: Alexander Larsson <alexl@redhat.com>
f8c80fb to
4c994eb
Compare
|
I rebased this (with no changes) to get the CI to re-run. Hopefully it works this time. |
The composefs backend currently uses the ID field in os-release as the UEFI vendor dir. This works for fedora, but this is not generally true, for example with e.g. rhel/redhat. And, its important to deploy in the correct vendor dir, because that is compiled into the binary (to find the slot addons). If things go to the wrong place, secureboot will not work.
So, I changed upstream to expose the built-in uefi vendor as a
subdirectory of
/usr/libexec/ukiboot/efi:https://gitlab.com/CentOS/automotive/src/ukiboot/-/merge_requests/42
This commit changes bootc to use this directory as the expected vendor name. If it is not found (i.e. for older ukiboot) we default to "BOOT", which is what the default ukiboot vendor name is.
Also, the upstream uefi directory addition is done with a backwards compatible symlink, so things will keep working (sans secureboot, as before) for older versions of ukiboot.
Generated-by: AI