Merged
Conversation
giuseppe
reviewed
Jan 14, 2021
I must admit I didn't test correctly, and there were two regressions with the previous commit on conn_sock. 1: sock_fullpath doesn't exist at the time that we need to copy its location into sun_path. As such, we need to use the proc entry of the parent dir, and use that as the parent path. 2: we do need the symlink to the bundle_path, as that's where the attach file actually lives. In addition, this commit makes specifying `--full-attach` ignore users specifying `--socket-path-dir`. Instead of conmon creating a symlink between `socket_path/$container_id` and `bundle_path`, it now uses `bundle_path` directly. This means callers to conmon must not rely on attach sockets being in their previously specified `socket_path` but rather in the container's `bundle_path` Signed-off-by: Peter Hunt <pehunt@redhat.com>
1915a92 to
b39ce63
Compare
Collaborator
Author
|
@rhatdan @mheon @saschagrunert PTAL (I packaged a totally broken conmon and it's on it's way to fedora now 🙃 this PR fixes it) |
Member
|
LGTM |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
I must admit I didn't test correctly, and there were two regressions with the previous commit on conn_sock.
1: sock_fullpath doesn't exist at the time that we need to copy its location into sun_path. As such, we need to use the proc entry of the parent dir, and use that as the parent path.
2: we do need the symlink to the bundle_path, as that's where the attach file actually lives.
Signed-off-by: Peter Hunt pehunt@redhat.com