diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-09-10 22:24:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-10 22:24:43 +0200 |
| commit | 997c4b56ed2121726e966afe9a102ed16ba78f93 (patch) | |
| tree | 35a0b0a43f9c5b6d484f93564f01a373802e44df /libpod/container_internal_linux.go | |
| parent | c1761ba1ac4155bab82fb9b847ccf96489b98265 (diff) | |
| parent | b6106341fb3a749ec37e59ee3290257a1729def1 (diff) | |
| download | podman-997c4b56ed2121726e966afe9a102ed16ba78f93.tar.gz podman-997c4b56ed2121726e966afe9a102ed16ba78f93.tar.bz2 podman-997c4b56ed2121726e966afe9a102ed16ba78f93.zip | |
Merge pull request #3961 from mheon/copy_volume_contents
When first mounting any named volume, copy up
Diffstat (limited to 'libpod/container_internal_linux.go')
| -rw-r--r-- | libpod/container_internal_linux.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index e96af8536..03374a060 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -115,7 +115,9 @@ func (c *Container) prepare() (Err error) { createErr = createNetNSErr } if mountStorageErr != nil { - logrus.Errorf("Error preparing container %s: %v", c.ID(), createErr) + if createErr != nil { + logrus.Errorf("Error preparing container %s: %v", c.ID(), createErr) + } createErr = mountStorageErr } |