Merge pull request #17497 from LK4D4/put_err

Do not ignore errors from graphdriver.Put
This commit is contained in:
Brian Goff 2015-10-29 19:37:10 -04:00
commit 82203d06eb
1 changed files with 6 additions and 2 deletions

View File

@ -992,13 +992,17 @@ func (daemon *Daemon) createRootfs(container *Container) error {
}
if err := setupInitLayer(initPath, rootUID, rootGID); err != nil {
daemon.driver.Put(initID)
if err := daemon.driver.Put(initID); err != nil {
logrus.Errorf("Failed to Put init layer: %v", err)
}
return err
}
// We want to unmount init layer before we take snapshot of it
// for the actual container.
daemon.driver.Put(initID)
if err := daemon.driver.Put(initID); err != nil {
return err
}
if err := daemon.driver.Create(container.ID, initID); err != nil {
return err