Skip to content

Commit f36cb63

Browse files
committed
libpod/networking_freebsd.go: Remove getSlirp4netnsIP()
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
1 parent cc5a951 commit f36cb63

File tree

3 files changed

+0
-12
lines changed

3 files changed

+0
-12
lines changed

cmd/podman/system/service_abi.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ func restService(flags *pflag.FlagSet, cfg *entities.PodmanConfig, opts entities
125125

126126
maybeMoveToSubCgroup()
127127

128-
maybeStartServiceReaper()
129128
infra.StartWatcher(libpodRuntime)
130129
server, err := api.NewServerWithSettings(libpodRuntime, listener, opts)
131130
if err != nil {

cmd/podman/system/service_abi_linux.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,8 @@ package system
55
import (
66
"github.com/sirupsen/logrus"
77
"go.podman.io/common/pkg/cgroups"
8-
"go.podman.io/common/pkg/servicereaper"
98
)
109

11-
// Currently, we only need servicereaper on Linux to support slirp4netns.
12-
func maybeStartServiceReaper() {
13-
servicereaper.Start()
14-
}
15-
1610
func maybeMoveToSubCgroup() {
1711
if err := cgroups.MaybeMoveToSubCgroup(); err != nil {
1812
// it is a best effort operation, so just print the

libpod/networking_freebsd.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
jdec "encoding/json"
88
"errors"
99
"fmt"
10-
"net"
1110
"os/exec"
1211

1312
"github.com/containers/buildah/pkg/jail"
@@ -44,10 +43,6 @@ type NetstatAddress struct {
4443
Collisions uint64 `json:"collisions"`
4544
}
4645

47-
func getSlirp4netnsIP(_ *net.IPNet) (*net.IP, error) {
48-
return nil, errors.New("not implemented GetSlirp4netnsIP")
49-
}
50-
5146
// This is called after the container's jail is created but before its
5247
// started. We can use this to initialise the container's vnet when we don't
5348
// have a separate vnet jail (which is the case in FreeBSD 13.3 and later).

0 commit comments

Comments
 (0)