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

Merge pull request #1238 from joshwget/show-more-command-output

Browse Source 
Show output for more commands in cloud-init-execute
This commit is contained in:
Darren Shepherd 2016-09-25 13:18:50 -07:00 committed by GitHub
commit bdf266e655
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/cloudinitexecute/cloudinitexecute.go
View File

@ -70,6 +70,8 @@ func ApplyConsole(cfg *rancherConfig.CloudConfig) {
if mount[2] == "swap" {
cmd := exec.Command("swapon", device)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
err := cmd.Run()
if err != nil {
log.Errorf("Unable to swapon %s: %v", device, err)
@ -85,6 +87,8 @@ func ApplyConsole(cfg *rancherConfig.CloudConfig) {
cmdArgs = append(cmdArgs, "-o", mount[3])
}
cmd := exec.Command("mount", cmdArgs...)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
log.Errorf("Failed to mount %s: %v", mount[1], err)
}
@ -96,7 +100,6 @@ func ApplyConsole(cfg *rancherConfig.CloudConfig) {
}
cmd := exec.Command(runcmd[0], runcmd[1:]...)
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
@ -159,12 +162,16 @@ func applyPreConsole(cfg *rancherConfig.CloudConfig) {
func resizeDevice(cfg *rancherConfig.CloudConfig) error {
cmd := exec.Command("growpart", cfg.Rancher.ResizeDevice, "1")
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
err := cmd.Run()
if err != nil {
return err
}
cmd = exec.Command("resize2fs", fmt.Sprintf("%s1", cfg.Rancher.ResizeDevice))
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
err = cmd.Run()
if err != nil {
return err