diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-11 16:34:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-11 16:34:08 -0500 |
| commit | b0a445e3545d66ba449f2e3e81bde3a2c5db4896 (patch) | |
| tree | 8e17b2501364ff5c3a1f8d5bd2875a3abfa05f03 /pkg/specgen/generate/pod_create.go | |
| parent | c4a9aa7c73e120fc2e246f056fec83ff35854dba (diff) | |
| parent | 6a3de93513947368bb27d2daf2d85e096bd5fa6b (diff) | |
| download | podman-b0a445e3545d66ba449f2e3e81bde3a2c5db4896.tar.gz podman-b0a445e3545d66ba449f2e3e81bde3a2c5db4896.tar.bz2 podman-b0a445e3545d66ba449f2e3e81bde3a2c5db4896.zip | |
Merge pull request #13203 from mheon/bump_rc5
Bump to v4.0.0-RC5
Diffstat (limited to 'pkg/specgen/generate/pod_create.go')
| -rw-r--r-- | pkg/specgen/generate/pod_create.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/specgen/generate/pod_create.go b/pkg/specgen/generate/pod_create.go index 03829e8cf..68fda3ad7 100644 --- a/pkg/specgen/generate/pod_create.go +++ b/pkg/specgen/generate/pod_create.go @@ -166,6 +166,9 @@ func createPodOptions(p *specgen.PodSpecGenerator, rt *libpod.Runtime, infraSpec ) if !p.NoInfra { //&& infraSpec != nil { options = append(options, libpod.WithInfraContainer()) + if p.ShareParent == nil || (p.ShareParent != nil && *p.ShareParent) { + options = append(options, libpod.WithPodParent()) + } nsOptions, err := GetNamespaceOptions(p.SharedNamespaces, p.InfraContainerSpec.NetNS.IsHost()) if err != nil { return nil, err |