Improve "is kernel compressed" check #60
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
The code was checking for this on all arches, but it's only arm64 kernels which vfkit can't boot if they are compressed.
So far we were using `h2non/filetype` which is not a great fit for what we want to do, as kernels do not have their own mimetypes, and there is no nice way to convey compressed/uncompressed/arch through mime types. This was working through heuristics so far, but the used heuristics break for the kernel used by puipui linux (https://github.com/Code-Hex/puipui-linux) This commit removes the use of h2non/filetype, and reuses the patterns from https://github.com/file/file/blob/master/magic/Magdir/linux to do the detection we need. This only adds a magic for uncompressed arm64 kernels. There's also a pattern for compressed kernels, but it does not match the arm64 kernels I tested with. They are either detected as gzip files, or as EFI files, and don't contain the magic pattern.
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
CI is failing as part of linter. |
This ensures both puipui kernel and fedora/RHEL kernels are detected as uncompressed when they are.
Fixed now! |
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.
ARM64 kernels must be uncompressed before they can be booted.
vfkit has a check for this to warn the user before attempting to start the VM.
However this check has both false negatives and false positives (with an
uncompressed puipui linux kernel, and with a compressed fedora kernel)
This PR should fix both situations