opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 11:32:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

use libnetwork/slirp4netns from c/common

Browse Source 
Most of the code moved there so if from there and remove it here.

Some extra changes are required here. This is a bit of a mess. The pipe
handling makes this a bit more difficult.

[NO NEW TESTS NEEDED] This is just a rework, existing tests must pass.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2023-06-20 15:58:01 +02:00
parent 180cf0cf17
commit 614c962c23
21 changed files with 853 additions and 881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libpod/container_exec.go
View File

@ -11,6 +11,7 @@ import (
"time"
"github.com/containers/common/pkg/resize"
"github.com/containers/common/pkg/util"
"github.com/containers/podman/v4/libpod/define"
"github.com/containers/podman/v4/libpod/events"
"github.com/containers/storage/pkg/stringid"
@ -923,7 +924,7 @@ func (c *Container) readExecExitCode(sessionID string) (int, error) {
chWait := make(chan error)
defer close(chWait)
_, err := WaitForFile(exitFile, chWait, time.Second*5)
_, err := util.WaitForFile(exitFile, chWait, time.Second*5)
if err != nil {
return -1, err
}