diff options
| author | openshift-merge-bot[bot] <148852131+openshift-merge-bot[bot]@users.noreply.github.com> | 2024-09-30 15:50:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-30 15:50:05 +0000 |
| commit | 639f3c6336ea3064e02d91c1ac9af8f952b7eed3 (patch) | |
| tree | 5f1b41e5ea548fb4b667640173046aa3e82a4637 | |
| parent | b4b33aa4c18f566744412a76f901fce9bdf10b20 (diff) | |
| parent | e07c31068f55b433da453de54295e4d3b09dc774 (diff) | |
Merge pull request #24104 from Sativarsainath-26/network-cmd-removal
update docs for network-cmd-path
| -rw-r--r-- | cmd/podman/root.go | 2 | ||||
| -rw-r--r-- | docs/source/markdown/podman.1.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/root.go b/cmd/podman/root.go index 1ad2cc18b..e48b497d7 100644 --- a/cmd/podman/root.go +++ b/cmd/podman/root.go @@ -543,7 +543,7 @@ func rootFlags(cmd *cobra.Command, podmanConfig *entities.PodmanConfig) { pFlags.StringVar(&podmanConfig.ConmonPath, conmonFlagName, "", "Path of the conmon binary") _ = cmd.RegisterFlagCompletionFunc(conmonFlagName, completion.AutocompleteDefault) - // TODO (5.0): --network-cmd-path is deprecated, remove this option with the next major release + // TODO (6.0): --network-cmd-path is deprecated, remove this option with the next major release // We need to find all the places that use r.config.Engine.NetworkCmdPath and remove it networkCmdPathFlagName := "network-cmd-path" pFlags.StringVar(&podmanConfig.ContainersConf.Engine.NetworkCmdPath, networkCmdPathFlagName, podmanConfig.ContainersConfDefaultsRO.Engine.NetworkCmdPath, "Path to the command for configuring the network") diff --git a/docs/source/markdown/podman.1.md b/docs/source/markdown/podman.1.md index ee62f1b52..548408061 100644 --- a/docs/source/markdown/podman.1.md +++ b/docs/source/markdown/podman.1.md @@ -101,7 +101,7 @@ Further note that the flag is a root-level flag and must be specified before any #### **--network-cmd-path**=*path* Path to the `slirp4netns(1)` command binary to use for setting up a slirp4netns network. 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. -**Note:** This option is deprecated and will be removed with Podman 5.0. Use the `helper_binaries_dir` option in `containers.conf` instead. +**Note:** This option is deprecated and will be removed with Podman 6.0. Use the `helper_binaries_dir` option in `containers.conf` instead. #### **--network-config-dir**=*directory* |