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

Move metadata ISO creation to common code

Browse Source 
This code was identical in the QEMU and HyperKit cases. Move it to util.go and
wrap it in a function, with minimal changes for returning an error.

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-11-20 15:14:58 +00:00
parent db9a783821
commit a5e5d42368
3 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/cmd/linuxkit/run_hyperkit.go
View File

@ -141,22 +141,11 @@ func runHyperKit(args []string) {
log.Fatalf("Could not create state directory: %v", err) log.Fatalf("Could not create state directory: %v", err)
} }
if *data != "" { metadataPaths, err := CreateMetadataISO(*state, *data)
var d []byte if err != nil {
if _, err := os.Stat(*data); os.IsNotExist(err) { log.Fatalf("%v", err)
d = []byte(*data)
} else {
d, err = ioutil.ReadFile(*data)
if err != nil {
log.Fatalf("Cannot read user data: %v", err)
}
}
isoPath := filepath.Join(*state, "data.iso")
if err := WriteMetadataISO(isoPath, d); err != nil {
log.Fatalf("Cannot write user data ISO: %v", err)
}
isoPaths = append(isoPaths, isoPath)
} }
isoPaths = append(isoPaths, metadataPaths...)
// Create UUID for VPNKit or reuse an existing one from state dir. IP addresses are // Create UUID for VPNKit or reuse an existing one from state dir. IP addresses are
// assigned to the UUID, so to get the same IP we have to store the initial UUID. If // assigned to the UUID, so to get the same IP we have to store the initial UUID. If

19
src/cmd/linuxkit/run_qemu.go
View File

@ -223,22 +223,11 @@ func runQemu(args []string) {
isoPaths = append(isoPaths, path) isoPaths = append(isoPaths, path)
} }
if *data != "" { metadataPaths, err := CreateMetadataISO(*state, *data)
var d []byte if err != nil {
if _, err := os.Stat(*data); os.IsNotExist(err) { log.Fatalf("%v", err)
d = []byte(*data)
} else {
d, err = ioutil.ReadFile(*data)
if err != nil {
log.Fatalf("Cannot read user data: %v", err)
}
}
isoPath := filepath.Join(*state, "data.iso")
if err := WriteMetadataISO(isoPath, d); err != nil {
log.Fatalf("Cannot write user data ISO: %v", err)
}
isoPaths = append(isoPaths, isoPath)
} }
isoPaths = append(isoPaths, metadataPaths...)
for i, d := range disks { for i, d := range disks {
id := "" id := ""

24
src/cmd/linuxkit/util.go
View File

@ -3,7 +3,9 @@ package main
import ( import (
"bufio" "bufio"
"fmt" "fmt"
"io/ioutil"
"os" "os"
"path/filepath"
"strconv" "strconv"
"strings" "strings"
) )
@ -252,3 +254,25 @@ func NewPublishedPort(publish string) (PublishedPort, error) {
p.Protocol = protocol p.Protocol = protocol
return p, nil return p, nil
} }
// CreateMetadataISO writes the provided meta data to an iso file in the given state directory
func CreateMetadataISO(state, data string) ([]string, error) {
if data == "" {
return []string{}, nil
}
var d []byte
if _, err := os.Stat(data); os.IsNotExist(err) {
d = []byte(data)
} else {
d, err = ioutil.ReadFile(data)
if err != nil {
return nil, fmt.Errorf("Cannot read user data: %v", err)
}
}
isoPath := filepath.Join(state, "data.iso")
if err := WriteMetadataISO(isoPath, d); err != nil {
return nil, fmt.Errorf("Cannot write user data ISO: %v", err)
}
return []string{isoPath}, nil
}