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

Merge pull request #173 from justincormack/lint-fix

Browse Source 
Fix some lint errors with error checking
This commit is contained in:
Justin Cormack 2017-10-30 13:31:11 +00:00 committed by GitHub
commit a12e954d92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/moby/output.go
View File

@ -62,6 +62,9 @@ var outFuns = map[string]func(string, []byte, int) error{
}, },
"raw-bios": func(base string, image []byte, size int) error { "raw-bios": func(base string, image []byte, size int) error {
kernel, initrd, cmdline, err := tarToInitrd(image) kernel, initrd, cmdline, err := tarToInitrd(image)
if err != nil {
return fmt.Errorf("Error converting to initrd: %v", err)
}
err = outputImg(rawBios, base+"-bios.img", kernel, initrd, cmdline) err = outputImg(rawBios, base+"-bios.img", kernel, initrd, cmdline)
if err != nil { if err != nil {
return fmt.Errorf("Error writing raw-bios output: %v", err) return fmt.Errorf("Error writing raw-bios output: %v", err)
@ -70,6 +73,9 @@ var outFuns = map[string]func(string, []byte, int) error{
}, },
"raw-efi": func(base string, image []byte, size int) error { "raw-efi": func(base string, image []byte, size int) error {
kernel, initrd, cmdline, err := tarToInitrd(image) kernel, initrd, cmdline, err := tarToInitrd(image)
if err != nil {
return fmt.Errorf("Error converting to initrd: %v", err)
}
err = outputImg(rawEfi, base+"-efi.img", kernel, initrd, cmdline) err = outputImg(rawEfi, base+"-efi.img", kernel, initrd, cmdline)
if err != nil { if err != nil {
return fmt.Errorf("Error writing raw-efi output: %v", err) return fmt.Errorf("Error writing raw-efi output: %v", err)