浏览代码

We need to umount /var/lib/docker when the daemon exits.

Currently we are leaving it bind mounted on stop.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Dan Walsh 11 年之前
父节点
当前提交
a3ff8a98f7
共有 1 个文件被更改,包括 4 次插入0 次删除
  1. 4 0
      daemon/daemon.go

+ 4 - 0
daemon/daemon.go

@@ -900,6 +900,10 @@ func (daemon *Daemon) Close() error {
 		utils.Errorf("daemon.containerGraph.Close(): %s", err.Error())
 		utils.Errorf("daemon.containerGraph.Close(): %s", err.Error())
 		errorsStrings = append(errorsStrings, err.Error())
 		errorsStrings = append(errorsStrings, err.Error())
 	}
 	}
+	if err := mount.Unmount(daemon.config.Root); err != nil {
+		utils.Errorf("daemon.Umount(%s): %s", daemon.config.Root, err.Error())
+		errorsStrings = append(errorsStrings, err.Error())
+	}
 	if len(errorsStrings) > 0 {
 	if len(errorsStrings) > 0 {
 		return fmt.Errorf("%s", strings.Join(errorsStrings, ", "))
 		return fmt.Errorf("%s", strings.Join(errorsStrings, ", "))
 	}
 	}