Skip to content

Commit 058a05a

Browse files
committed
libpod: Remove network-cmd-path
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
1 parent 31fec0f commit 058a05a

File tree

3 files changed

+0
-22
lines changed

3 files changed

+0
-22
lines changed

docs/source/markdown/podman.1.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,6 @@ Load the specified `containers.conf(5)` module. Can be an absolute or relative
104104
This flag is not supported on the remote client, including Mac and Windows (excluding WSL2) machines.
105105
Further note that the flag is a root-level flag and must be specified before any Podman sub-command.
106106

107-
#### **--network-cmd-path**=*path*
108-
Path to the `slirp4netns(1)` command binary to use for setting up a slirp4netns network.
109-
If "" is used, then the binary will first be searched using the `helper_binaries_dir` option in `containers.conf`, and second using the `$PATH` environment variable.
110-
**Note:** This option is deprecated and will be removed with Podman 6.0. Use the `helper_binaries_dir` option in `containers.conf` instead.
111-
112107
#### **--network-config-dir**=*directory*
113108

114109
Path to the directory where network configuration files are located.

libpod/options.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -180,20 +180,6 @@ func WithConmonPath(path string) RuntimeOption {
180180
}
181181
}
182182

183-
// WithNetworkCmdPath specifies the path to the slirp4netns binary which manages the
184-
// runtime.
185-
func WithNetworkCmdPath(path string) RuntimeOption {
186-
return func(rt *Runtime) error {
187-
if rt.valid {
188-
return define.ErrRuntimeFinalized
189-
}
190-
191-
rt.config.Engine.NetworkCmdPath = path
192-
193-
return nil
194-
}
195-
}
196-
197183
// WithNetworkBackend specifies the name of the network backend.
198184
func WithNetworkBackend(name string) RuntimeOption {
199185
return func(rt *Runtime) error {

pkg/domain/infra/runtime_libpod.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,6 @@ func getRuntime(ctx context.Context, fs *flag.FlagSet, opts *engineOpts) (*libpo
164164
if fs.Changed("tmpdir") {
165165
options = append(options, libpod.WithTmpDir(cfg.ContainersConf.Engine.TmpDir))
166166
}
167-
if fs.Changed("network-cmd-path") {
168-
options = append(options, libpod.WithNetworkCmdPath(cfg.ContainersConf.Engine.NetworkCmdPath))
169-
}
170167
if fs.Changed("network-backend") {
171168
options = append(options, libpod.WithNetworkBackend(cfg.ContainersConf.Network.NetworkBackend))
172169
}

0 commit comments

Comments
 (0)