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

Copy init and cloud-init-save logs from before switchroot

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2017-07-18 14:13:11 +10:00
parent 32061238aa
commit cbfe50c5ee
6 changed files with 51 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/cloudinitsave/cloudinitsave.go
View File

@@ -258,7 +258,11 @@ func getDatasources(datasources []string) []datasource.Datasource {
case "packet":
dss = append(dss, packet.NewDatasource(root))
case "vmware":
dss = append(dss, vmware.NewDatasource(root))
// made vmware datasource dependent on detecting vmware independently, as it crashes things otherwise
v := vmware.NewDatasource(root)
if v != nil {
dss = append(dss, v)
}
}
}
@@ -295,7 +299,7 @@ func selectDatasource(sources []datasource.Datasource) datasource.Datasource {
duration := datasourceInterval
for {
log.Infof("cloud-init: Checking availability of %q\n", s.Type())
log.Infof("cloud-init: Checking availability of %q", s.Type())
if s.IsAvailable() {
log.Infof("cloud-init: Datasource available: %s", s)
ds <- s