live: clean up CPIO handling; support extracting from arbitrarily concatenated archives #708
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
We were letting xz2 finalize compression in Drop and not checking the return value.
jlebon
approved these changes
Dec 9, 2021
Have the extraction function return None if the member is not found, rather than erroring out.
If the buffer passed to read() is zero-length, a return value of Ok(0) does not indicate EOF. Don't do a trailing-garbage check in this case. I'm not aware of this bug occurring in the wild, and current code paths shouldn't exercise it.
|
It turns out Dropped the last commit for now. It's better suited to the followup PR where it'll be used. |
Fix mishandling of two cases: - Read can return Ok(0) when not at EOF if the buffer argument is zero-length. - It's legal to call read() again after EOF, in which case we were trying to unwrap the thread handle again and panicking. Instead, return any thread error when we first reach EOF, and Ok(0) afterward.
We're about to switch to an xz implementation that doesn't handle trailing garbage detection itself.
xz2::bufread::XzDecoder errors on trailing garbage in the input stream, but we need to support trailing data to decode arbitrary initrds. xz2::write::XzDecoder does not error in this case, so implement the API of bufread::XzDecoder in terms of write::XzDecoder.
This allows `pxe ignition unwrap` to extract Ignition configs from initrds that have been concatenated to the OS initrd artifact. It will also be useful for other things later.
The kernel uses the last copy of a file in the archive, not the first, so we should do the same.
|
CI caught a failure 🎈 🎉 🎆 in osmet unpacking because we were calling |
jlebon
approved these changes
Dec 14, 2021
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.
pxe ignition unwrapfor now, but will also be useful infrastructure for switchingpxe customizeto producing a concatenated initrd. That's more consistent with theiso customizeUX, and also allows us to avoid possible version skew between the generated config and the OS version it's intended for.