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

Fixes for output types

Browse Source 
Make `raw` output type call its file `.raw` as well, other minor fixes.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2017-06-07 16:46:36 +01:00
parent 68ffbb5e7e
commit 98732e8936
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/moby/output.go
View File

@ -54,7 +54,7 @@ var outFuns = map[string]func(string, []byte, int, bool) error{
return nil return nil
}, },
"raw": func(base string, image []byte, size int, hyperkit bool) error { "raw": func(base string, image []byte, size int, hyperkit bool) error {
filename := base + ".img" filename := base + ".raw"
log.Infof(" %s", filename) log.Infof(" %s", filename)
kernel, initrd, cmdline, err := tarToInitrd(image) kernel, initrd, cmdline, err := tarToInitrd(image)
if err != nil { if err != nil {
@ -62,7 +62,7 @@ var outFuns = map[string]func(string, []byte, int, bool) error{
} }
err = outputLinuxKit("raw", filename, kernel, initrd, cmdline, size, hyperkit) err = outputLinuxKit("raw", filename, kernel, initrd, cmdline, size, hyperkit)
if err != nil { if err != nil {
return fmt.Errorf("Error writing qcow2 output: %v", err) return fmt.Errorf("Error writing raw output: %v", err)
} }
return nil return nil
}, },
@ -73,7 +73,7 @@ var outFuns = map[string]func(string, []byte, int, bool) error{
} }
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 gcp-img output: %v", err) return fmt.Errorf("Error writing gcp output: %v", err)
} }
return nil return nil
}, },
@ -97,7 +97,7 @@ var outFuns = map[string]func(string, []byte, int, bool) error{
} }
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 writingvhd output: %v", err) return fmt.Errorf("Error writing vhd output: %v", err)
} }
return nil return nil
}, },