From ec59c74f65c6b0fc749bfd009304b673298235e9 Mon Sep 17 00:00:00 2001 From: Sainath Sativar Date: Sun, 29 Sep 2024 13:55:58 +0100 Subject: [PATCH] removing network-cmd-path from podman configuration Signed-off-by: Sainath Sativar --- libnetwork/slirp4netns/slirp4netns.go | 11 ++++------- pkg/config/config.go | 3 --- pkg/config/containers.conf | 4 ---- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/libnetwork/slirp4netns/slirp4netns.go b/libnetwork/slirp4netns/slirp4netns.go index 9721750ab..f4e724602 100644 --- a/libnetwork/slirp4netns/slirp4netns.go +++ b/libnetwork/slirp4netns/slirp4netns.go @@ -246,13 +246,10 @@ func createBasicSlirpCmdArgs(options *networkOptions, features *slirpFeatures) ( // Setup can be called in rootful as well as in rootless. // Spawns the slirp4netns process and setup port forwarding if ports are given. func Setup(opts *SetupOptions) (*SetupResult, error) { - path := opts.Config.Engine.NetworkCmdPath - if path == "" { - var err error - path, err = opts.Config.FindHelperBinary(BinaryName, true) - if err != nil { - return nil, fmt.Errorf("could not find slirp4netns, the network namespace can't be configured: %w", err) - } + var err error + path, err := opts.Config.FindHelperBinary(BinaryName, true) + if err != nil { + return nil, fmt.Errorf("could not find slirp4netns, the network namespace can't be configured: %w", err) } syncR, syncW, err := os.Pipe() diff --git a/pkg/config/config.go b/pkg/config/config.go index 2d6bf276a..fb87539cb 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -393,9 +393,6 @@ type EngineConfig struct { // containers and pods will be visible. The default namespace is "". Namespace string `toml:"namespace,omitempty"` - // NetworkCmdPath is the path to the slirp4netns binary. - NetworkCmdPath string `toml:"network_cmd_path,omitempty"` - // NetworkCmdOptions is the default options to pass to the slirp4netns binary. // For example "allow_host_loopback=true" NetworkCmdOptions attributedstring.Slice `toml:"network_cmd_options,omitempty"` diff --git a/pkg/config/containers.conf b/pkg/config/containers.conf index 7f0954931..69c03138a 100644 --- a/pkg/config/containers.conf +++ b/pkg/config/containers.conf @@ -628,10 +628,6 @@ default_sysctls = [ # #namespace = "" -# Path to the slirp4netns binary -# -#network_cmd_path = "" - # Default options to pass to the slirp4netns binary. # Valid options values are: #