diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-07-08 07:55:30 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-07-19 18:43:32 +0000 |
| commit | 98703eb204923f06555605c648fc165a55214520 (patch) | |
| tree | a407bae8b3489d4f9b0f0d0f228658bbfe95a38e /libpod/storage.go | |
| parent | c020db8cd21cb221cfbe36b264e0ec02999596ed (diff) | |
| download | podman-98703eb204923f06555605c648fc165a55214520.tar.gz podman-98703eb204923f06555605c648fc165a55214520.tar.bz2 podman-98703eb204923f06555605c648fc165a55214520.zip | |
Vendor in latest code for storage,image, buildah
vendor in containers/storage
vendor in containers/image
vendor in projectatomic/buildah
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #1114
Approved by: mheon
Diffstat (limited to 'libpod/storage.go')
| -rw-r--r-- | libpod/storage.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libpod/storage.go b/libpod/storage.go index b969df7f3..ff366edf2 100644 --- a/libpod/storage.go +++ b/libpod/storage.go @@ -231,21 +231,21 @@ func (r *storageService) MountContainerImage(idOrName string) (string, error) { return mountPoint, nil } -func (r *storageService) UnmountContainerImage(idOrName string) error { +func (r *storageService) UnmountContainerImage(idOrName string) (bool, error) { if idOrName == "" { - return ErrEmptyID + return false, ErrEmptyID } container, err := r.store.Container(idOrName) if err != nil { - return err + return false, err } - err = r.store.Unmount(container.ID) + mounted, err := r.store.Unmount(container.ID, false) if err != nil { logrus.Debugf("failed to unmount container %q: %v", container.ID, err) - return err + return false, err } logrus.Debugf("unmounted container %q", container.ID) - return nil + return mounted, nil } func (r *storageService) GetWorkDir(id string) (string, error) { |