ソースを参照

Merge pull request #78 from dotcloud/77-undeleted_mountpoint-fix

Fix undeleted mountpoint on destroy
Guillaume J. Charmes 12 年 前
コミット
7188dcd96d
1 ファイル変更3 行追加4 行削除
  1. 3 4
      docker.go

+ 3 - 4
docker.go

@@ -76,10 +76,9 @@ func (docker *Docker) Destroy(container *Container) error {
 		if err := container.Mountpoint.Umount(); err != nil {
 			log.Printf("Unable to umount container %v: %v", container.Id, err)
 		}
-
-		if err := container.Mountpoint.Deregister(); err != nil {
-			log.Printf("Unable to deregiser mountpoint %v: %v", container.Mountpoint.Root, err)
-		}
+	}
+	if err := container.Mountpoint.Deregister(); err != nil {
+		log.Printf("Unable to deregiser mountpoint %v: %v", container.Mountpoint.Root, err)
 	}
 	if err := os.RemoveAll(container.Root); err != nil {
 		log.Printf("Unable to remove filesystem for %v: %v", container.Id, err)