toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Image.Changes: Deactivate image device after unmounting it

Browse Source 
There is no need to keep the image device around if we were the
onces creating the device.
Upstream-commit: 071cc18b58408eaa71575e0233a056475196b199
Component: engine
This commit is contained in:
Alexander Larsson
2013-09-19 19:23:35 +02:00
committed by Tianon Gravi
parent 64c3059ad8
commit 1461717d2e
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/engine/image.go
View File

@ -617,6 +617,8 @@ func (image *Image) Changes(runtime *Runtime, root, rw, id string) ([]Change, er
return nil, err
}
wasActivated := devices.HasActivatedDevice(image.ID)
// We re-use rw for the temporary mount of the base image as its
// not used by device-mapper otherwise
err = devices.MountDevice(image.ID, rw)
@ -626,6 +628,9 @@ func (image *Image) Changes(runtime *Runtime, root, rw, id string) ([]Change, er
changes, err := ChangesDirs(root, rw)
_ = devices.UnmountDevice(image.ID, rw)
if !wasActivated {
_ = devices.DeactivateDevice(image.ID)
}
if err != nil {
return nil, err
}