From afa3c3e94aa30318cbe3d0605bb6b99ce74db2a3 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Thu, 30 Apr 2015 22:16:27 -0700
Subject: [PATCH] Switch to new labels syntax.  Also launch acpid earlier

---
 config/default.go | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/config/default.go b/config/default.go
index f35340bf..a7d9f0cd 100644
--- a/config/default.go
+++ b/config/default.go
@@ -330,12 +330,9 @@ func NewConfig() *Config {
 			"acpid": {
 				Image:      "acpid",
 				Privileged: true,
-				Links: []string{
-					"console",
-				},
-				Labels: []string{
-					SCOPE + "=" + SYSTEM,
-				},
+				Labels: project.NewSliceorMap(map[string]string{
+					SCOPE: SYSTEM,
+				}),
 				VolumesFrom: []string{
 					"command-volumes",
 					"system-volumes",