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

Merge pull request #169 from deitch/add-raw-efi-bios-rename-aws

Browse Source 
Add raw file formats, rename raw to aws and qcow2 to qcow2-bios
This commit is contained in:
Justin Cormack 2017-10-30 11:28:53 +00:00 committed by GitHub
commit 4a95c04300
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/moby/output.go
View File

@ -13,8 +13,10 @@ import (
)
const (
bios = "linuxkit/mkimage-iso-bios:165b051322578cb0c2a4f16253b20f7d2797a502"
efi = "linuxkit/mkimage-iso-efi:dc12bc6827f84334b02d1c70599acf80b840c126"
isoBios = "linuxkit/mkimage-iso-bios:165b051322578cb0c2a4f16253b20f7d2797a502"
isoEfi = "linuxkit/mkimage-iso-efi:dc12bc6827f84334b02d1c70599acf80b840c126"
rawBios = "linuxkit/mkimage-raw-bios:58e4f6cc12c9b34d7aaeba323c7bca0b30ba43cb"
rawEfi = "linuxkit/mkimage-raw-efi:fcd94e494396e314a9d24be7e1379ccc8eb380e0"
gcp = "linuxkit/mkimage-gcp:d1883809d212ce048f60beb0308a4d2b14c256af"
vhd = "linuxkit/mkimage-vhd:2a31f2bc91c1d247160570bd17868075e6c0009a"
vmdk = "linuxkit/mkimage-vmdk:df02a4fabd87a82209fbbacebde58c4440d2daf0"
@ -45,20 +47,36 @@ var outFuns = map[string]func(string, []byte, int) error{
return nil
},
"iso-bios": func(base string, image []byte, size int) error {
err := outputIso(bios, base+".iso", image)
err := outputIso(isoBios, base+".iso", image)
if err != nil {
return fmt.Errorf("Error writing iso-bios output: %v", err)
}
return nil
},
"iso-efi": func(base string, image []byte, size int) error {
err := outputIso(efi, base+"-efi.iso", image)
err := outputIso(isoEfi, base+"-efi.iso", image)
if err != nil {
return fmt.Errorf("Error writing iso-efi output: %v", err)
}
return nil
},
"raw": func(base string, image []byte, size int) error {
"raw-bios": func(base string, image []byte, size int) error {
kernel, initrd, cmdline, err := tarToInitrd(image)
err = outputImg(rawBios, base+"-bios.img", kernel, initrd, cmdline)
if err != nil {
return fmt.Errorf("Error writing raw-bios output: %v", err)
}
return nil
},
"raw-efi": func(base string, image []byte, size int) error {
kernel, initrd, cmdline, err := tarToInitrd(image)
err = outputImg(rawEfi, base+"-efi.img", kernel, initrd, cmdline)
if err != nil {
return fmt.Errorf("Error writing raw-efi output: %v", err)
}
return nil
},
"aws": func(base string, image []byte, size int) error {
filename := base + ".raw"
log.Infof(" %s", filename)
kernel, initrd, cmdline, err := tarToInitrd(image)
@ -82,7 +100,7 @@ var outFuns = map[string]func(string, []byte, int) error{
}
return nil
},
"qcow2": func(base string, image []byte, size int) error {
"qcow2-bios": func(base string, image []byte, size int) error {
filename := base + ".qcow2"
log.Infof(" %s", filename)
kernel, initrd, cmdline, err := tarToInitrd(image)