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

Revert "Revert "Storage""

Browse Source 
This reverts commit 7b2bf93271.
This commit is contained in:
Darren Shepherd
2015-08-27 12:24:26 -07:00
parent eed4057f5f
commit 72be1d11e6
74 changed files with 6422 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
init/init.go
View File

@@ -139,6 +139,7 @@ func getLaunchConfig(cfg *config.CloudConfig, dockerCfg *config.DockerConfig) (*
launchConfig.DnsConfig.Nameservers = cfg.Rancher.Network.Dns.Nameservers
launchConfig.DnsConfig.Search = cfg.Rancher.Network.Dns.Search
launchConfig.Environment = dockerCfg.Environment
if !cfg.Rancher.Debug {
launchConfig.LogFile = config.SYSTEM_DOCKER_LOG