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

Merge pull request #972 from joshwget/boot-with-invalid-config

Browse Source 
Fix boot issues due to invalid configs
This commit is contained in:
Darren Shepherd
2016-06-02 19:27:23 -06:00
parent 5659173628 08f40ad3e7
commit 71c8f40ffe
14 changed files with 124 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
init/init.go
View File

@@ -117,10 +117,7 @@ func mountState(cfg *config.CloudConfig) error {
func mountOem(cfg *config.CloudConfig) (*config.CloudConfig, error) {
if cfg == nil {
var err error
if cfg, err = config.LoadConfig(); err != nil {
return cfg, err
}
cfg = config.LoadConfig()
}
if err := mountConfigured("oem", cfg.Rancher.State.OemDev, cfg.Rancher.State.OemFsType, config.OEM); err != nil {
log.Debugf("Not mounting OEM: %v", err)
@@ -198,10 +195,7 @@ func RunInit() error {
},
mountOem,
func(_ *config.CloudConfig) (*config.CloudConfig, error) {
cfg, err := config.LoadConfig()
if err != nil {
return cfg, err
}
cfg := config.LoadConfig()
if cfg.Rancher.Debug {
cfgString, err := config.Export(false, true)
@@ -217,7 +211,7 @@ func RunInit() error {
loadModules,
tryMountAndBootstrap,
func(_ *config.CloudConfig) (*config.CloudConfig, error) {
return config.LoadConfig()
return config.LoadConfig(), nil
},
loadModules,
func(c *config.CloudConfig) (*config.CloudConfig, error) {