aa64: Minor fix for efi vendordir #634
Merged
Conversation
This file contains 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
HuijingHei
commented
Mar 27, 2024
| @@ -484,7 +488,7 @@ pub(crate) fn set_efi_current(device: &str, espdir: &openat::Dir, vendordir: &st | |||
| if espdir.exists(&shim)? { | |||
| anyhow::bail!("Failed to find {SHIM}"); | |||
| } | |||
| let loader = format!("\\EFI\\{}\\shimx64.efi", vendordir); | |||
| let loader = format!("\\EFI\\{}\\{SHIM}", vendordir); | |||
There was a problem hiding this comment.
@cgwalters update this to sync with SHIM, or might have issue on aarch64 as it does not have shimx64.efi when called by --update-firmware?
There was a problem hiding this comment.
Yes, this looks right. I suspect the only reason it may have appeared to work on aarch64 is because we ended up using the fallback path.
Minor fix for coreos#633
cgwalters
approved these changes
Mar 27, 2024
| @@ -484,7 +488,7 @@ pub(crate) fn set_efi_current(device: &str, espdir: &openat::Dir, vendordir: &st | |||
| if espdir.exists(&shim)? { | |||
| anyhow::bail!("Failed to find {SHIM}"); | |||
| } | |||
| let loader = format!("\\EFI\\{}\\shimx64.efi", vendordir); | |||
| let loader = format!("\\EFI\\{}\\{SHIM}", vendordir); | |||
There was a problem hiding this comment.
Yes, this looks right. I suspect the only reason it may have appeared to work on aarch64 is because we ended up using the fallback path.
|
Thanks @cgwalters for the review! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Minor fix for #633