-
-
Notifications
You must be signed in to change notification settings - Fork 9.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
os/mac/diagnostic: fix OpenCore check #18765
Conversation
Interesting that CI runner triggers it. I wonder if it is actually set up with OpenCore. |
Yea, I only checked GitHub hosted runners which do not seem to use OpenCore. If that's the case then maybe we can allow it in CI? |
Can you add |
|
Yeh, agreed to allow in CI unless it's failing specifically in our CI. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good once CI check removed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can confirm that nvram 4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102:opencore-version
only returns a value when the current installation was actually booted via OCLP. (Oddly, the other command nvram 4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102:OCLP-Version
still returns a value even when booting off of a non-OCLP boot disk.)
An alternate detection method would be to check for Lilu in the list of loaded kexts, e.g.:
% kmutil showloaded | grep Lilu
No variant specified, falling back to release
52 10 0 0x2f000 0x2f000 as.vit9696.Lilu (1.6.7) 087C34D2-49F8-3FDA-8757-27E9425C9EE4 <9 7 6 3 2 1>
Co-authored-by: Eric Knibbe <[email protected]>
@MikeMcQuaid Not sure if I followed. I added the CI check ( |
Ah, no worries, ignore me then. 🚢 it! |
OpenCore is a bootloader whereas OCLP is what patches old hardware to run newer OS. So the unsupported configuration is more OCLP rather than OpenCore as that is what makes old CPUs run on macOS versions where our x86_64 binaries might not necessarily be built for said old CPUs (i.e. pre-Westmere). Given Eric's findings above, the reliable check might be to check if both |
This is based on [1]. [1]: #18765 (comment)
Thanks for the explanation! Adding an additional check for OCLP in #18766. I suppose with that we won't need to skip the check in CI. |
brew style
with your changes locally?brew typecheck
with your changes locally?brew tests
with your changes locally?Fixes #18763.