diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-01 09:51:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-01 09:51:23 -0400 |
| commit | 23e57575b0a402d7f7de9d20571776d0512fd489 (patch) | |
| tree | 15e4759aa0305b4cecd9d20eeeaafbc5955eb9cf /libpod/pod_api.go | |
| parent | 59fcf0e39d91e00d8385ffda3a09c32a1464c117 (diff) | |
| parent | 7a5342804944472246ed0b977e9088e0b01be87b (diff) | |
| download | podman-23e57575b0a402d7f7de9d20571776d0512fd489.tar.gz podman-23e57575b0a402d7f7de9d20571776d0512fd489.tar.bz2 podman-23e57575b0a402d7f7de9d20571776d0512fd489.zip | |
Merge pull request #13594 from cdoern/podVolumes
fix pod volume passing and alter infra inheritance
Diffstat (limited to 'libpod/pod_api.go')
| -rw-r--r-- | libpod/pod_api.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/pod_api.go b/libpod/pod_api.go index be726d8d1..48049798b 100644 --- a/libpod/pod_api.go +++ b/libpod/pod_api.go @@ -602,8 +602,8 @@ func (p *Pod) Inspect() (*define.InspectPodData, error) { infraConfig.CPUSetCPUs = p.ResourceLim().CPU.Cpus infraConfig.PidNS = p.PidMode() infraConfig.UserNS = p.UserNSMode() - namedVolumes, mounts := infra.sortUserVolumes(infra.config.Spec) - inspectMounts, err = infra.GetInspectMounts(namedVolumes, infra.config.ImageVolumes, mounts) + namedVolumes, mounts := infra.SortUserVolumes(infra.config.Spec) + inspectMounts, err = infra.GetMounts(namedVolumes, infra.config.ImageVolumes, mounts) infraSecurity = infra.GetSecurityOptions() if err != nil { return nil, err |