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

output: Extract ucode if present

Browse Source 
For now the backends for the different formats do not yet
use the extracted ucode cpio archive, but '// TODO' are
placed for the backends which should eventually handle it.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2018-01-15 15:17:31 +00:00
parent 0c1b1def13
commit 2b1a611bab
3 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/initrd/initrd.go
View File

@ -110,13 +110,13 @@ func CopyTar(w *Writer, r *tar.Reader) (written int64, err error) {
} }
} }
// CopySplitTar copies a tar stream into an initrd, but splits out kernel and cmdline // CopySplitTar copies a tar stream into an initrd, but splits out kernel, cmdline, and ucode
func CopySplitTar(w *Writer, r *tar.Reader) (kernel []byte, cmdline string, err error) { func CopySplitTar(w *Writer, r *tar.Reader) (kernel []byte, cmdline string, ucode []byte, err error) {
for { for {
var thdr *tar.Header var thdr *tar.Header
thdr, err = r.Next() thdr, err = r.Next()
if err == io.EOF { if err == io.EOF {
return kernel, cmdline, nil return kernel, cmdline, ucode, nil
} }
if err != nil { if err != nil {
return return
@ -134,6 +134,11 @@ func CopySplitTar(w *Writer, r *tar.Reader) (kernel []byte, cmdline string, err
return return
} }
cmdline = string(buf) cmdline = string(buf)
case "boot/ucode.cpio":
ucode, err = ioutil.ReadAll(r)
if err != nil {
return
}
case "boot": case "boot":
// skip this entry // skip this entry
default: default:

2
src/moby/linuxkit.go
View File

@ -72,7 +72,7 @@ func ensureLinuxkitImage(name string) error {
return err return err
} }
defer image.Close() defer image.Close()
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)
} }

32
src/moby/output.go
View File

@ -27,10 +27,11 @@ const (
var outFuns = map[string]func(string, io.Reader, int) error{ var outFuns = map[string]func(string, io.Reader, int) error{
"kernel+initrd": func(base string, image io.Reader, size int) error { "kernel+initrd": func(base string, image io.Reader, size int) error {
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)
} }
// TODO: Handle ucode
err = outputKernelInitrd(base, kernel, initrd, cmdline) err = outputKernelInitrd(base, kernel, initrd, cmdline)
if err != nil { if err != nil {
return fmt.Errorf("Error writing kernel+initrd output: %v", err) return fmt.Errorf("Error writing kernel+initrd output: %v", err)
@ -38,10 +39,11 @@ var outFuns = map[string]func(string, io.Reader, int) error{
return nil return nil
}, },
"tar-kernel-initrd": func(base string, image io.Reader, size int) error { "tar-kernel-initrd": func(base string, image io.Reader, size int) error {
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)
} }
// TODO: Handle ucode
if err := outputKernelInitrdTarball(base, kernel, initrd, cmdline); err != nil { if err := outputKernelInitrdTarball(base, kernel, initrd, cmdline); err != nil {
return fmt.Errorf("Error writing kernel+initrd tarball output: %v", err) return fmt.Errorf("Error writing kernel+initrd tarball output: %v", err)
} }
@ -62,10 +64,11 @@ var outFuns = map[string]func(string, io.Reader, int) error{
return nil return nil
}, },
"raw-bios": func(base string, image io.Reader, size int) error { "raw-bios": func(base string, image io.Reader, size int) error {
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)
} }
// TODO: Handle ucode
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)
@ -73,7 +76,7 @@ var outFuns = map[string]func(string, io.Reader, int) error{
return nil return nil
}, },
"raw-efi": func(base string, image io.Reader, size int) error { "raw-efi": func(base string, image io.Reader, size int) error {
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)
} }
@ -86,7 +89,7 @@ var outFuns = map[string]func(string, io.Reader, int) error{
"aws": func(base string, image io.Reader, size int) error { "aws": func(base string, image io.Reader, size int) error {
filename := base + ".raw" 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 {
return fmt.Errorf("Error converting to initrd: %v", err) return fmt.Errorf("Error converting to initrd: %v", err)
} }
@ -97,7 +100,7 @@ var outFuns = map[string]func(string, io.Reader, int) error{
return nil return nil
}, },
"gcp": func(base string, image io.Reader, size int) error { "gcp": func(base string, image io.Reader, size int) error {
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)
} }
@ -110,10 +113,11 @@ var outFuns = map[string]func(string, io.Reader, int) error{
"qcow2-bios": func(base string, image io.Reader, size int) error { "qcow2-bios": func(base string, image io.Reader, size int) error {
filename := base + ".qcow2" filename := base + ".qcow2"
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 {
return fmt.Errorf("Error converting to initrd: %v", err) return fmt.Errorf("Error converting to initrd: %v", err)
} }
// TODO: Handle ucode
err = outputLinuxKit("qcow2", filename, kernel, initrd, cmdline, size) err = outputLinuxKit("qcow2", filename, kernel, initrd, cmdline, size)
if err != nil { if err != nil {
return fmt.Errorf("Error writing qcow2 output: %v", err) return fmt.Errorf("Error writing qcow2 output: %v", err)
@ -121,7 +125,7 @@ var outFuns = map[string]func(string, io.Reader, int) error{
return nil return nil
}, },
"vhd": func(base string, image io.Reader, size int) error { "vhd": func(base string, image io.Reader, size int) error {
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)
} }
@ -132,7 +136,7 @@ var outFuns = map[string]func(string, io.Reader, int) error{
return nil return nil
}, },
"dynamic-vhd": func(base string, image io.Reader, size int) error { "dynamic-vhd": func(base string, image io.Reader, size int) error {
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)
} }
@ -143,7 +147,7 @@ var outFuns = map[string]func(string, io.Reader, int) error{
return nil return nil
}, },
"vmdk": func(base string, image io.Reader, size int) error { "vmdk": func(base string, image io.Reader, size int) error {
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)
} }
@ -220,16 +224,16 @@ func Formats(base string, image string, formats []string, size int) error {
return nil return nil
} }
func tarToInitrd(r io.Reader) ([]byte, []byte, string, error) { func tarToInitrd(r io.Reader) ([]byte, []byte, string, []byte, error) {
w := new(bytes.Buffer) w := new(bytes.Buffer)
iw := initrd.NewWriter(w) iw := initrd.NewWriter(w)
tr := tar.NewReader(r) tr := tar.NewReader(r)
kernel, cmdline, err := initrd.CopySplitTar(iw, tr) kernel, cmdline, ucode, err := initrd.CopySplitTar(iw, tr)
if err != nil { if err != nil {
return []byte{}, []byte{}, "", err return []byte{}, []byte{}, "", []byte{}, err
} }
iw.Close() iw.Close()
return kernel, w.Bytes(), cmdline, nil return kernel, w.Bytes(), cmdline, ucode, nil
} }
func tarInitrdKernel(kernel, initrd []byte, cmdline string) (*bytes.Buffer, error) { func tarInitrdKernel(kernel, initrd []byte, cmdline string) (*bytes.Buffer, error) {