Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[v4.0] slirp: fix setup on ipv6 disabled systems #13546

Closed
wants to merge 1 commit into from
Closed

[v4.0] slirp: fix setup on ipv6 disabled systems #13546

wants to merge 1 commit into from

Conversation

openshift-cherrypick-robot
Copy link
Collaborator

This is an automated cherry-pick of #13485

/assign baude

@Luap99
slirp: fix setup on ipv6 disabled systems
adb9501 
When enable_ipv6=true is set for slirp4netns (default since podman v4),
we will try to set the accept sysctl. This sysctl will not exist on
systems that have ipv6 disabled. In this case we should not error and
just ignore the extra ipv6 setup.

Also the current logic to wait for the slirp4 setup was kinda broken, it
did not actually wait until the sysctl was set before starting slirp.
This should now be fixed by using two `sync.WaitGroup`s.

[NO NEW TESTS NEEDED]

Fixes containers#13388

Signed-off-by: Paul Holzinger <[email protected]>
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Mar 17, 2022
Merged
@baude
Copy link
Member

baude commented Mar 17, 2022

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 17, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: baude, openshift-cherrypick-robot

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 17, 2022
@Luap99
Copy link
Member

Luap99 commented Mar 17, 2022

Nice, is it also possible when I have a PR with several commit to only cherry pick a specific one?

@TomSweeneyRedHat TomSweeneyRedHat added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 17, 2022
@baude
Copy link
Member

baude commented Mar 18, 2022

Nice, is it also possible when I have a PR with several commit to only cherry pick a specific one?

i frankly don't know. Seems like something we should try?

@baude
Copy link
Member

baude commented Mar 18, 2022

also -> https://pkg.go.dev/github.com/abayer/test-infra/prow/external-plugins/cherrypicker#section-documentation the part about doing it before merge is awesome

@TomSweeneyRedHat
Copy link
Member

Looks like some kind of Make issue on this branch? @cevich?

@TomSweeneyRedHat
Copy link
Member

Changes LGTM.
Another to DO NOT MERGE until we get an exception.

@Luap99
Copy link
Member

Luap99 commented Mar 18, 2022

This is the 4.0 branch, shouldn't this be used for upstream use only?
I thought RHEL uses 4.0-rhel, am I misunderstanding something?

@Luap99
Copy link
Member

Luap99 commented Mar 18, 2022

This PR needs to be rebased to fix up the windows test.
@baude You know the rebase command?

@TomSweeneyRedHat
Copy link
Member

@mheon had wanted to keep the two in sync for a bit @Luap99

@cevich
Copy link
Member

cevich commented Mar 18, 2022

Ya, this should be fixed by my backport PR (that just merged today). git remote update && git rebase -i upstream/v4.0 and force-push should take care of it.

@TomSweeneyRedHat TomSweeneyRedHat removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 23, 2022
@Luap99
Copy link
Member

Luap99 commented Mar 25, 2022

@openshift-cherrypick-robot rebase

@Luap99
Copy link
Member

Luap99 commented Mar 25, 2022

/rebase

@mheon
Copy link
Member

mheon commented Mar 25, 2022

@Luap99 I'm just going to manually cherry-pick this

@Luap99 Luap99 closed this Apr 7, 2022
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 21, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 21, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@baude baude

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@openshift-cherrypick-robot @baude @Luap99 @TomSweeneyRedHat @cevich @mheon