From 23b79424c05415979d220416a988f7c25bb27243 Mon Sep 17 00:00:00 2001
From: Victor Vieux <vieux@docker.com>
Date: Wed, 3 Aug 2016 16:22:12 -0700
Subject: [PATCH] fix deadlock when more than 1 plugin is installed

Signed-off-by: Victor Vieux <vieux@docker.com>
(cherry picked from commit 42360d164b9f25fb4b150ef066fcf57fa39559a7)
Signed-off-by: Tibor Vass <tibor@docker.com>
---
 plugin/manager.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/manager.go b/plugin/manager.go
index fae852b1d1..aa7f5d642e 100644
--- a/plugin/manager.go
+++ b/plugin/manager.go
@@ -326,8 +326,8 @@ func (pm *Manager) init() error {
 				}
 			}
 		}(p)
-		group.Wait()
 	}
+	group.Wait()
 	return pm.save()
 }