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

Refactor configuration

Browse Source
This commit is contained in:
Darren Shepherd
2015-02-17 14:31:20 -07:00
parent 11a11ca3d1
commit f47ea34ac4
7 changed files with 133 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sysinit/sysinit.go
View File

@@ -118,7 +118,7 @@ func runContainers(cfg *config.Config) error {
containerConfigs := cfg.SystemContainers
if cfg.Rescue {
log.Debug("Running rescue container")
containerConfigs = []config.ContainerConfig{cfg.RescueContainer}
containerConfigs = []config.ContainerConfig{*cfg.RescueContainer}
}
for _, containerConfig := range containerConfigs {
@@ -130,7 +130,7 @@ func runContainers(cfg *config.Config) error {
continue
}
if containerConfig.Id == cfg.ConsoleContainer {
if containerConfig.Id == config.CONSOLE_CONTAINER {
if util.IsRunningInTty() {
container.Config.Tty = true
container.Config.AttachStdin = true