github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 17:49:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #23 from justincormack/fmt

Browse Source 
Go fmt
This commit is contained in:
Justin Cormack 2017-05-08 17:50:44 +01:00 committed by GitHub
commit 86b4d1cdb2
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
cmd/moby/output.go
View File

@ -7,8 +7,8 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"github.com/linuxkit/linuxkit/src/initrd"
log "github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"github.com/linuxkit/linuxkit/src/initrd"
) )
const ( const (
@ -41,54 +41,54 @@ func outputs(m *Moby, base string, image []byte) error {
} }
case "iso-bios": case "iso-bios":
kernel, initrd, cmdline, err := tarToInitrd(image) kernel, initrd, cmdline, err := tarToInitrd(image)
if err != nil { if err != nil {
return fmt.Errorf("Error converting to initrd: %v", err) return fmt.Errorf("Error converting to initrd: %v", err)
} }
err = outputISO(bios, base+".iso", kernel, initrd, cmdline) err = outputISO(bios, base+".iso", kernel, initrd, cmdline)
if err != nil { if err != nil {
return fmt.Errorf("Error writing %s output: %v", o.Format, err) return fmt.Errorf("Error writing %s output: %v", o.Format, err)
} }
case "iso-efi": case "iso-efi":
kernel, initrd, cmdline, err := tarToInitrd(image) kernel, initrd, cmdline, err := tarToInitrd(image)
if err != nil { if err != nil {
return fmt.Errorf("Error converting to initrd: %v", err) return fmt.Errorf("Error converting to initrd: %v", err)
} }
err = outputISO(efi, base+"-efi.iso", kernel, initrd, cmdline) err = outputISO(efi, base+"-efi.iso", kernel, initrd, cmdline)
if err != nil { if err != nil {
return fmt.Errorf("Error writing %s output: %v", o.Format, err) return fmt.Errorf("Error writing %s output: %v", o.Format, err)
} }
case "gcp-img": case "gcp-img":
kernel, initrd, cmdline, err := tarToInitrd(image) kernel, initrd, cmdline, err := tarToInitrd(image)
if err != nil { if err != nil {
return fmt.Errorf("Error converting to initrd: %v", err) return fmt.Errorf("Error converting to initrd: %v", err)
} }
err = outputImg(gcp, base+".img.tar.gz", kernel, initrd, cmdline) err = outputImg(gcp, base+".img.tar.gz", kernel, initrd, cmdline)
if err != nil { if err != nil {
return fmt.Errorf("Error writing %s output: %v", o.Format, err) return fmt.Errorf("Error writing %s output: %v", o.Format, err)
} }
case "qcow", "qcow2": case "qcow", "qcow2":
kernel, initrd, cmdline, err := tarToInitrd(image) kernel, initrd, cmdline, err := tarToInitrd(image)
if err != nil { if err != nil {
return fmt.Errorf("Error converting to initrd: %v", err) return fmt.Errorf("Error converting to initrd: %v", err)
} }
err = outputImg(qcow, base+".qcow2", kernel, initrd, cmdline) err = outputImg(qcow, base+".qcow2", kernel, initrd, cmdline)
if err != nil { if err != nil {
return fmt.Errorf("Error writing %s output: %v", o.Format, err) return fmt.Errorf("Error writing %s output: %v", o.Format, err)
} }
case "vhd": case "vhd":
kernel, initrd, cmdline, err := tarToInitrd(image) kernel, initrd, cmdline, err := tarToInitrd(image)
if err != nil { if err != nil {
return fmt.Errorf("Error converting to initrd: %v", err) return fmt.Errorf("Error converting to initrd: %v", err)
} }
err = outputImg(vhd, base+".vhd", kernel, initrd, cmdline) err = outputImg(vhd, base+".vhd", kernel, initrd, cmdline)
if err != nil { if err != nil {
return fmt.Errorf("Error writing %s output: %v", o.Format, err) return fmt.Errorf("Error writing %s output: %v", o.Format, err)
} }
case "vmdk": case "vmdk":
kernel, initrd, cmdline, err := tarToInitrd(image) kernel, initrd, cmdline, err := tarToInitrd(image)
if err != nil { if err != nil {
return fmt.Errorf("Error converting to initrd: %v", err) return fmt.Errorf("Error converting to initrd: %v", err)
} }
err = outputImg(vmdk, base+".vmdk", kernel, initrd, cmdline) err = outputImg(vmdk, base+".vmdk", kernel, initrd, cmdline)
if err != nil { if err != nil {
return fmt.Errorf("Error writing %s output: %v", o.Format, err) return fmt.Errorf("Error writing %s output: %v", o.Format, err)