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

Merge pull request #310 from janeczku/fix-cloudinit-network

Browse Source 
BUGFIX: Boot stalls for 5 mins in cloud-init-pre
This commit is contained in:
Darren Shepherd
2015-05-14 16:02:46 -07:00
parent 893d57ff6c 0894639b33
commit d164e5759b
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/cloudinit/cloudinit.go
View File

@@ -393,13 +393,17 @@ func getDatasources(cfg *rancherConfig.Config) []datasource.Datasource {
dss = append(dss, file.NewDatasource(parts[1])) dss = append(dss, file.NewDatasource(parts[1]))
} }
case "url": case "url":
if network {
if len(parts) == 2 { if len(parts) == 2 {
dss = append(dss, url.NewDatasource(parts[1])) dss = append(dss, url.NewDatasource(parts[1]))
} }
}
case "cmdline": case "cmdline":
if network {
if len(parts) == 1 { if len(parts) == 1 {
dss = append(dss, proc_cmdline.NewDatasource()) dss = append(dss, proc_cmdline.NewDatasource())
} }
}
case "configdrive": case "configdrive":
if len(parts) == 2 { if len(parts) == 2 {
dss = append(dss, configdrive.NewDatasource(parts[1])) dss = append(dss, configdrive.NewDatasource(parts[1]))