Fix handling of resolv.conf in the chroot #134
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
…build environment by accident.
mwhudson
approved these changes
Jul 13, 2023
|
The CI is not looking great but that's also present in trunk. I'll try to address that before merging. |
|
Sadly, with the current CI failures which I'm still investigating, we can't reliably get full coverage report. I'll merge this as-is and perform some manual tests before pushing it to later channels. |
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.
We have some logic in place that backs-up the resolv.conf in the chroot, puts the host one in place for package installation and then restores the original resolv.conf so that we don't leak the host config into the images. Sadly, it seems that debootstrap basically copies the resolv.conf from the host system into the chroot it generates. Looking into what live-build was doing, it seems that live-build was always truncating the resolv.conf that we were getting from debootstrap, so let's do the same.
While checking what live-build was doing, I also noticed a nifty conditional that checks if during package installation resolv.conf wasn't substituted with a symlink (example has been given of systemd-resolved or resolvconf), and making sure we leave the new resolv.conf symlink in place. So I added it here as well.
All changes come with testing. Had to add a new test suite for the helper functions.