Merge pull request docker-archive#2 from mlaventure/chp-moby-33422

Don't unmount entire plugin manager tree on remove
silvin-lubecki · Jun 5, 2017 · a2bfb1a · a2bfb1a
2 parents 041f3bb + 63460e3
commit a2bfb1a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/plugin/backend_linux.go b/plugin/backend_linux.go
@@ -633,8 +633,8 @@ func (pm *Manager) Remove(name string, config *types.PluginRmConfig) error {
 	id := p.GetID()
 	pm.config.Store.Remove(p)
 	pluginDir := filepath.Join(pm.config.Root, id)
-	if err := recursiveUnmount(pm.config.Root); err != nil {
-		logrus.WithField("dir", pm.config.Root).WithField("id", id).Warn(err)
+	if err := recursiveUnmount(pluginDir); err != nil {
+		logrus.WithField("dir", pluginDir).WithField("id", id).Warn(err)
 	}
 	if err := os.RemoveAll(pluginDir); err != nil {
 		logrus.Warnf("unable to remove %q from plugin remove: %v", pluginDir, err)