stages: add efi_src_dir config to grub2.iso stage#2202
Merged
mvo5 merged 1 commit intoosbuild:mainfrom Sep 26, 2025
Merged
Conversation
Member
|
Is this bootupd path an implementation detail or documented that this is the path that will contain EFI binaries? It doesn't matter much since we can pick the source by users of this stage but it would be nice to know if this is 'the right place' :) |
mvo5
added a commit
to mvo5/bootc-image-builder
that referenced
this pull request
Sep 24, 2025
Contributor
Author
You mean this path |
4cffab0 to
afd4709
Compare
achilleas-k
reviewed
Sep 24, 2025
afd4709 to
c3a636a
Compare
ondrejbudai
reviewed
Sep 25, 2025
achilleas-k
previously approved these changes
Sep 25, 2025
Member
achilleas-k
left a comment
There was a problem hiding this comment.
Ondrej is right. Regardless, this LGTM :)
c3a636a to
b644dd8
Compare
supakeen
approved these changes
Sep 25, 2025
achilleas-k
approved these changes
Sep 25, 2025
We currently hardcode the location of the efi binaries to `/boot/efi/EFI/`. This makes sense in general but when working with bootc containers the location is usually different and inside `/usr/lib/bootupd/updates/EFI/`. So this commit makes the location configurable in a similar way as we already have it for the grub2 (non-iso) stage (in the grub2 stage its under `uefi` but in this stage everything is flat incuding the vendor so `efi_src_dir` is flat as well). The rational is that we want to build ISOs from bootc base images (c.f. osbuild/bootc-image-builder#1053) but also do not want every bootc installer image to have a special bootupd grub iso configuration (which would also hard to maintain as it would be duplicated in every container). So instead we use this stage to generate the config and just point to a different EFI dir.
b644dd8 to
135d493
Compare
mvo5
added a commit
to mvo5/osbuild
that referenced
this pull request
Sep 26, 2025
Sadly the support for a single custom `efi_src_dir` [0] to look
for EFI binaries is not enough for the anaconda-bootc work:
The default shim on a bootc system is diverted from
`/boot/efi/EFI/` to `/usr/lib/bootupd/updates/EFI/`.
We also need to install "grub2-iso-x64-cdboot" for a booting
iso from the base bootc container. This will be put under
the regular `/boot/efi/EFI/<vendor>/gcdx64.efi` location.
So the `org.osbuild.grub2.iso` stage will need to be able
to lookup the required binaries in both places. Hence
this commit tweaks the option to allow an array of
paths for the `efi_src_dirs` so that this can be supported.
The images library will then set this to:
``go
bootTreePipeline.EfiSrcDirs = []string{
"/boot/efi/EFI/",
"/usr/lib/bootupd/updates/EFI/",
}
```
Note that this could have also been solved with something like
`efi_fallback_dir` or even hardcoding the fallback here but
an array feels more extensible (even though I don't foresee
even more locations). But YAGNI, I'm open for ideas and we
could also just hardcode the fallback here and drop the
`efi_src_dir` option entirely.
This is needed for
osbuild/bootc-image-builder#1059
[0] osbuild#2202
mvo5
added a commit
to mvo5/osbuild
that referenced
this pull request
Sep 26, 2025
Sadly the support for a single custom `efi_src_dir` [0] to look
for EFI binaries is not enough for the anaconda-bootc work:
The default shim on a bootc system is diverted from
`/boot/efi/EFI/` to `/usr/lib/bootupd/updates/EFI/`.
We also need to install "grub2-iso-x64-cdboot" for a booting
iso from the base bootc container. This will be put under
the regular `/boot/efi/EFI/<vendor>/gcdx64.efi` location.
So the `org.osbuild.grub2.iso` stage will need to be able
to lookup the required binaries in both places. Hence
this commit tweaks the option to allow an array of
paths for the `efi_src_dirs` so that this can be supported.
The images library will then set this to:
```go
bootTreePipeline.EfiSrcDirs = []string{
"/boot/efi/EFI/",
"/usr/lib/bootupd/updates/EFI/",
}
```
Note that this could have also been solved with something like
`efi_fallback_dir` or even hardcoding the fallback here but
an array feels more extensible (even though I don't foresee
even more locations). But YAGNI, I'm open for ideas and we
could also just hardcode the fallback here and drop the
`efi_src_dir` option entirely.
This is needed for
osbuild/bootc-image-builder#1059
[0] osbuild#2202
mvo5
added a commit
to mvo5/osbuild
that referenced
this pull request
Sep 26, 2025
Sadly the support for a single custom `efi_src_dir` [0] to look
for EFI binaries is not enough for the anaconda-bootc work:
The default shim on a bootc system is diverted from
`/boot/efi/EFI/` to `/usr/lib/bootupd/updates/EFI/`.
We also need to install "grub2-iso-x64-cdboot" for a booting
iso from the base bootc container. This will be put under
the regular `/boot/efi/EFI/<vendor>/gcdx64.efi` location.
So the `org.osbuild.grub2.iso` stage will need to be able
to lookup the required binaries in both places. Hence
this commit tweaks the option to allow an array of
paths for the `efi_src_dirs` so that this can be supported.
The images library will then set this to:
```go
bootTreePipeline.EfiSrcDirs = []string{
"/boot/efi/EFI/",
"/usr/lib/bootupd/updates/EFI/",
}
```
Note that this could have also been solved with something like
`efi_fallback_dir` or even hardcoding the fallback here but
an array feels more extensible (even though I don't foresee
even more locations). But YAGNI, I'm open for ideas and we
could also just hardcode the fallback here and drop the
`efi_src_dir` option entirely.
This is needed for
osbuild/bootc-image-builder#1059
[0] osbuild#2202
mvo5
added a commit
to mvo5/osbuild
that referenced
this pull request
Sep 26, 2025
Sadly the support for a single custom `efi_src_dir` [0] to look
for EFI binaries is not enough for the anaconda-bootc work:
The default shim on a bootc system is diverted from
`/boot/efi/EFI/` to `/usr/lib/bootupd/updates/EFI/`.
We also need to install "grub2-iso-x64-cdboot" for a booting
iso from the base bootc container. This will be put under
the regular `/boot/efi/EFI/<vendor>/gcdx64.efi` location.
So the `org.osbuild.grub2.iso` stage will need to be able
to lookup the required binaries in both places. Hence
this commit tweaks the option to allow an array of
paths for the `efi_src_dirs` so that this can be supported.
The images library will then set this to:
```go
bootTreePipeline.EfiSrcDirs = []string{
"/boot/efi/EFI/",
"/usr/lib/bootupd/updates/EFI/",
}
```
This is needed for
osbuild/bootc-image-builder#1059
[0] osbuild#2202
mvo5
added a commit
to mvo5/osbuild
that referenced
this pull request
Sep 26, 2025
Sadly the support for a single custom `efi_src_dir` [0] to look
for EFI binaries is not enough for the anaconda-bootc work:
The default shim on a bootc system is diverted from
`/boot/efi/EFI/` to `/usr/lib/bootupd/updates/EFI/`.
We also need to install "grub2-iso-x64-cdboot" for a booting
iso from the base bootc container. This will be put under
the regular `/boot/efi/EFI/<vendor>/gcdx64.efi` location.
So the `org.osbuild.grub2.iso` stage will need to be able
to lookup the required binaries in both places. Hence
this commit tweaks the option to allow an array of
paths for the `efi_src_dirs` so that this can be supported.
The images library will then set this to:
```go
bootTreePipeline.EfiSrcDirs = []string{
"/boot/efi/EFI/",
"/usr/lib/bootupd/updates/EFI/",
}
```
This is needed for
osbuild/bootc-image-builder#1059
[0] osbuild#2202
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
We currently hardcode the location of the efi binaries to
/boot/efi/EFI. This makes sense in general but when working with bootc containers the location is usually different and inside/usr/lib/bootupd/updates/EFI. So this commit makes the location configurable in a similar way as we already have it for the grub2 (non-iso) stage (in the grub2 stage its underuefibut in this stage everything is flat incuding the vendor soefi_src_diris flat as well).The rational is that we want to build ISOs from bootc base images (c.f.
osbuild/bootc-image-builder#1053) but also do not want every bootc installer image to have a special bootupd grub iso configuration (which would also hard to maintain as it would be duplicated in every container). So instead we use this stage to generate the config and just point to a different EFI dir.
Needed for osbuild/bootc-image-builder#1053