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

cli: Add option to specify hyperkit to use

Browse Source 
Some users seem to have Docker for Mac/hyperkit in a non-standard
path. Allow them to specify the path to the hyperkit executable.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer
2017-03-31 19:21:02 +01:00
parent c77d932321
commit db7b8a3b71
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cmd/moby/run_hyperkit.go
View File

@@ -21,6 +21,7 @@ func runHyperKit(args []string) {
fmt.Printf("Options:\n")
hyperkitCmd.PrintDefaults()
}
runHyperKit := hyperkitCmd.String("hyperkit", "", "Path to hyperkit binary (if not in default location)")
runCPUs := hyperkitCmd.Int("cpus", 1, "Number of CPUs")
runMem := hyperkitCmd.Int("mem", 1024, "Amount of memory in MB")
runDiskSz := hyperkitCmd.Int("disk-size", 0, "Size of Disk in MB")
@@ -34,10 +35,10 @@ func runHyperKit(args []string) {
prefix = remArgs[0]
}
runHyperKitInternal(*runCPUs, *runMem, *runDiskSz, *runDisk, prefix)
runHyperKitInternal(*runHyperKit, *runCPUs, *runMem, *runDiskSz, *runDisk, prefix)
}
func runHyperKitInternal(cpus, mem, diskSz int, disk, prefix string) {
func runHyperKitInternal(hyperkitPath string, cpus, mem, diskSz int, disk, prefix string) {
cmdline, err := ioutil.ReadFile(prefix + "-cmdline")
if err != nil {
log.Fatalf("Cannot open cmdline file: %v", err)
@@ -47,7 +48,7 @@ func runHyperKitInternal(cpus, mem, diskSz int, disk, prefix string) {
disk = prefix + "-disk.img"
}
h, err := hyperkit.New("", "", "auto", disk)
h, err := hyperkit.New(hyperkitPath, "", "auto", disk)
if err != nil {
log.Fatalln("Error creating hyperkit: ", err)
}