summaryrefslogtreecommitdiff
path: root/libpod/container_internal.go
diff options
context:
space:
mode:
authorDoug Rabson <dfr@rabson.org>2022-08-16 11:14:54 +0100
committerDoug Rabson <dfr@rabson.org>2022-08-17 12:55:32 +0100
commit5d7778411a14b2a10d2e66bb0e4cdf7262cf2689 (patch)
tree165dee7bdc2c8647bf4cdb2e81f75dade282f11a /libpod/container_internal.go
parent1b88927c2cf1db7b6530748d67528b5209d93b42 (diff)
downloadpodman-5d7778411a14b2a10d2e66bb0e4cdf7262cf2689.tar.gz
podman-5d7778411a14b2a10d2e66bb0e4cdf7262cf2689.tar.bz2
podman-5d7778411a14b2a10d2e66bb0e4cdf7262cf2689.zip
libpod: Move rootless network setup details to container_internal_linux.go
This removes a use of state.NetNS which is a linux-specific field defined in container_linux.go from the generic container_internal.go, allowing that to build on non-linux platforms. [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
Diffstat (limited to 'libpod/container_internal.go')
-rw-r--r--libpod/container_internal.go16
1 files changed, 2 insertions, 14 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 7cef067b0..2d08b56f8 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -293,20 +293,8 @@ func (c *Container) handleRestartPolicy(ctx context.Context) (_ bool, retErr err
}
// set up slirp4netns again because slirp4netns will die when conmon exits
- if c.config.NetMode.IsSlirp4netns() {
- err := c.runtime.setupSlirp4netns(c, c.state.NetNS)
- if err != nil {
- return false, err
- }
- }
-
- // set up rootlesskit port forwarder again since it dies when conmon exits
- // we use rootlesskit port forwarder only as rootless and when bridge network is used
- if rootless.IsRootless() && c.config.NetMode.IsBridge() && len(c.config.PortMappings) > 0 {
- err := c.runtime.setupRootlessPortMappingViaRLK(c, c.state.NetNS.Path(), c.state.NetworkStatus)
- if err != nil {
- return false, err
- }
+ if err := c.setupRootlessNetwork(); err != nil {
+ return false, err
}
if c.state.State == define.ContainerStateStopped {