Prechádzať zdrojové kódy

Merge pull request #6008 from rhatdan/umount

We need to umount /var/lib/docker when the daemon exits.
Victor Vieux 11 rokov pred
rodič
commit
0874b85627
1 zmenil súbory, kde vykonal 4 pridanie a 0 odobranie
  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, ", "))
 	}
 	}