diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2021-08-23 11:00:55 +0200 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2021-08-30 13:19:47 -0400 |
| commit | 17afae4ebdc44fdea8f4dfccdd347e5a65804427 (patch) | |
| tree | 93455e160eebe6701eb7e94527b6c4031b310025 /cmd | |
| parent | c16daa07ed2ccb251d2eaf76614c8fde433dcc91 (diff) | |
| download | podman-17afae4ebdc44fdea8f4dfccdd347e5a65804427.tar.gz podman-17afae4ebdc44fdea8f4dfccdd347e5a65804427.tar.bz2 podman-17afae4ebdc44fdea8f4dfccdd347e5a65804427.zip | |
Use pod netns with --pod-id-file
When `--pod-id-file` is used do not parse the default network namespace
and let specgen handle it instead.
This regression was introduced in commit 7ef3981abe24.
Fixes #11303
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/containers/create.go | 2 | ||||
| -rw-r--r-- | cmd/podman/containers/run.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go index c88cf050e..ba762ecbb 100644 --- a/cmd/podman/containers/create.go +++ b/cmd/podman/containers/create.go @@ -84,7 +84,7 @@ func create(cmd *cobra.Command, args []string) error { var ( err error ) - cliVals.Net, err = common.NetFlagsToNetOptions(cmd, cliVals.Pod == "") + cliVals.Net, err = common.NetFlagsToNetOptions(cmd, cliVals.Pod == "" && cliVals.PodIDFile == "") if err != nil { return err } diff --git a/cmd/podman/containers/run.go b/cmd/podman/containers/run.go index 579af4eb1..830d1de7f 100644 --- a/cmd/podman/containers/run.go +++ b/cmd/podman/containers/run.go @@ -106,7 +106,7 @@ func init() { func run(cmd *cobra.Command, args []string) error { var err error - cliVals.Net, err = common.NetFlagsToNetOptions(cmd, cliVals.Pod == "") + cliVals.Net, err = common.NetFlagsToNetOptions(cmd, cliVals.Pod == "" && cliVals.PodIDFile == "") if err != nil { return err } |