1
0
mirror of https://github.com/rancher/os.git synced 2025-06-30 08:41:48 +00:00

Switch to new labels syntax. Also launch acpid earlier

This commit is contained in:
Darren Shepherd 2015-04-30 22:16:27 -07:00
parent d845d16674
commit afa3c3e94a

View File

@ -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",