diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-19 23:49:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-19 23:49:06 +0100 |
| commit | e561280510e4ef5fc4100811a971d134b01c72a9 (patch) | |
| tree | 63bdda9690847c269079ea531e7beacc5eb7fe22 /pkg/spec/storage.go | |
| parent | f2bcc9cc7dc8b1937f39db503db96651d84c3e3e (diff) | |
| parent | d65ff6b3ec18aad6a64329c54a83d5ba5d51b62f (diff) | |
| download | podman-e561280510e4ef5fc4100811a971d134b01c72a9.tar.gz podman-e561280510e4ef5fc4100811a971d134b01c72a9.tar.bz2 podman-e561280510e4ef5fc4100811a971d134b01c72a9.zip | |
Merge pull request #5204 from baude/apiv2createlibpod
apiv2 container create using specgen
Diffstat (limited to 'pkg/spec/storage.go')
| -rw-r--r-- | pkg/spec/storage.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/spec/storage.go b/pkg/spec/storage.go index 0e2098c1d..e37fa2451 100644 --- a/pkg/spec/storage.go +++ b/pkg/spec/storage.go @@ -825,7 +825,7 @@ func (config *CreateConfig) addContainerInitBinary(path string) (spec.Mount, err // TODO: Should we unmount subtree mounts? E.g., if /tmp/ is mounted by // one mount, and we already have /tmp/a and /tmp/b, should we remove // the /tmp/a and /tmp/b mounts in favor of the more general /tmp? -func supercedeUserMounts(mounts []spec.Mount, configMount []spec.Mount) []spec.Mount { +func SupercedeUserMounts(mounts []spec.Mount, configMount []spec.Mount) []spec.Mount { if len(mounts) > 0 { // If we have overlappings mounts, remove them from the spec in favor of // the user-added volume mounts @@ -854,7 +854,7 @@ func supercedeUserMounts(mounts []spec.Mount, configMount []spec.Mount) []spec.M } // Ensure mount options on all mounts are correct -func initFSMounts(inputMounts []spec.Mount) ([]spec.Mount, error) { +func InitFSMounts(inputMounts []spec.Mount) ([]spec.Mount, error) { // We need to look up mounts so we can figure out the proper mount flags // to apply. systemMounts, err := pmount.GetMounts() |