rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-31 14:23:11 +00:00
Code Issues Releases Wiki Activity

Merge pull request #597 from imikushin/usr-dev

Browse Source 
remove boot behaviour dependency on version string
This commit is contained in:
Ivan Mikushin
2015-10-13 11:13:31 +05:00
parent f2166030bc c79a64e42e
commit 44b705c525
4 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
init/init.go
View File

@@ -129,7 +129,7 @@ func tryMountAndBootstrap(cfg *config.CloudConfig) (*config.CloudConfig, error)
}
log.Debugf("Switching to new root at %s", STATE)
return cfg, switchRoot(STATE)
return cfg, switchRoot(STATE, cfg.Rancher.RmUsr)
}
func getLaunchConfig(cfg *config.CloudConfig, dockerCfg *config.DockerConfig) (*dockerlaunch.Config, []string) {