rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-04 00:04:25 +00:00
Code Issues Releases Wiki Activity

Refactor how consoles and engines are loaded

Browse Source
This commit is contained in:
Josh Curl
2016-09-15 16:12:15 -07:00
parent 5987d713a4
commit cf998978a8
3 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/switchconsole/switch_console.go
View File

@@ -4,7 +4,6 @@ import (
"os"
log "github.com/Sirupsen/logrus"
composeConfig "github.com/docker/libcompose/config"
"github.com/docker/libcompose/project/options"
"github.com/rancher/os/compose"
"github.com/rancher/os/config"
@@ -25,9 +24,7 @@ func Main() {
}
if newConsole != "default" {
project.ServiceConfigs.Add("console", &composeConfig.ServiceConfig{})
if err = compose.LoadService(project, cfg, true, newConsole); err != nil {
if err = compose.LoadSpecialService(project, cfg, "console", newConsole); err != nil {
log.Fatal(err)
}
}