mirror of
https://github.com/containers/podman.git
synced 2025-05-17 15:18:43 +08:00
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
This commit is contained in:

committed by
Atomic Bot

parent
c020db8cd2
commit
98703eb204
@ -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) {
|
||||
|
Reference in New Issue
Block a user