diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-03 18:34:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-03 18:34:01 +0200 |
| commit | 2d9b9e81a30ac46848587414d34955ad4cb991a7 (patch) | |
| tree | a9467bc800c4441448873018912de215950d540a /pkg/specgen/oci.go | |
| parent | a89d62ac3a445a5d76bd72d4b8e1bb9262ba74c6 (diff) | |
| parent | e0614367ca27c2e47649e08291e0f1d19d42232e (diff) | |
| download | podman-2d9b9e81a30ac46848587414d34955ad4cb991a7.tar.gz podman-2d9b9e81a30ac46848587414d34955ad4cb991a7.tar.bz2 podman-2d9b9e81a30ac46848587414d34955ad4cb991a7.zip | |
Merge pull request #5676 from kolyshkin/volume-flags-alt
Fix/improve pkg/storage.InitFSMounts
Diffstat (limited to 'pkg/specgen/oci.go')
| -rw-r--r-- | pkg/specgen/oci.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkg/specgen/oci.go b/pkg/specgen/oci.go index 2523f21b3..db60dc25e 100644 --- a/pkg/specgen/oci.go +++ b/pkg/specgen/oci.go @@ -215,11 +215,9 @@ func (s *SpecGenerator) toOCISpec(rt *libpod.Runtime, newImage *image.Image) (*s // BIND MOUNTS configSpec.Mounts = createconfig.SupercedeUserMounts(s.Mounts, configSpec.Mounts) // Process mounts to ensure correct options - finalMounts, err := createconfig.InitFSMounts(configSpec.Mounts) - if err != nil { + if err := createconfig.InitFSMounts(configSpec.Mounts); err != nil { return nil, err } - configSpec.Mounts = finalMounts // Add annotations if configSpec.Annotations == nil { |