Skip to content

Commit 8e39f4b

Browse files
committed
libpod/networking_common.go: Remove slirp
Signed-off-by: Lokesh Mandvekar <[email protected]>
1 parent 75cd973 commit 8e39f4b

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

libpod/networking_common.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ func (r *Runtime) teardownNetwork(ctr *Container) error {
111111
return err
112112
}
113113

114-
if !ctr.config.NetMode.IsSlirp4netns() &&
115-
!ctr.config.NetMode.IsPasta() && len(networks) > 0 {
114+
if !ctr.config.NetMode.IsPasta() && len(networks) > 0 {
116115
netOpts := ctr.getNetworkOptions(networks)
117116
return r.teardownNetworkBackend(ctr.state.NetNS, netOpts)
118117
}
@@ -134,7 +133,7 @@ func isBridgeNetMode(n namespaces.NetworkMode) error {
134133
// firewall configuration.
135134
// Efforts will be made to preserve MAC and IP addresses.
136135
// Only works on containers with bridge networking at present, though in the future we could
137-
// extend this to stop + restart slirp4netns
136+
// extend this to stop + restart pasta (?)
138137
func (r *Runtime) reloadContainerNetwork(ctr *Container) (map[string]types.StatusBlock, error) {
139138
if ctr.state.NetNS == "" {
140139
return nil, fmt.Errorf("container %s network is not configured, refusing to reload: %w", ctr.ID(), define.ErrCtrStateInvalid)

0 commit comments

Comments
 (0)