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

Fix golint check error

Browse Source 
https://github.com/rancher/os/issues/2166
This commit is contained in:
niusmallnan
2017-12-06 13:45:49 +08:00
parent d8bba34a87
commit 7b474cd905
8 changed files with 13 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/control/install.go
View File

@@ -216,10 +216,7 @@ func runInstall(image, installType, cloudConfig, device, partition, statedir, ka
"--volumes-from=command-volumes", image, "-d", device, "-t", installType, "-c", cloudConfig,
"-a", kappend)
cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
if err := cmd.Run(); err != nil {
return err
}
return nil
return cmd.Run()
}
}
}
@@ -308,10 +305,7 @@ func runInstall(image, installType, cloudConfig, device, partition, statedir, ka
cmd := exec.Command("system-docker", installerCmd...)
log.Debugf("Run(%v)", cmd)
cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
if err := cmd.Run(); err != nil {
return err
}
return nil
return cmd.Run()
}
}
@@ -691,11 +685,7 @@ func setDiskpartitions(device, diskType string) error {
log.Errorf("parted: %s", err)
return err
}
if err := setBootable(device, diskType); err != nil {
return err
}
return nil
return setBootable(device, diskType)
}
func partitionMounted(device string, file io.Reader) bool {