From 87667051f288648299089c178e0024193c5b012f Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 24 Jan 2018 14:09:27 +0000 Subject: [PATCH] cmd: Adjust run_hyperkit to interface changes Signed-off-by: Rolf Neugebauer --- src/cmd/linuxkit/run_hyperkit.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/cmd/linuxkit/run_hyperkit.go b/src/cmd/linuxkit/run_hyperkit.go index df4376b49..5897a90b5 100644 --- a/src/cmd/linuxkit/run_hyperkit.go +++ b/src/cmd/linuxkit/run_hyperkit.go @@ -26,6 +26,10 @@ const ( hyperkitNetworkingDefault = hyperkitNetworkingDockerForMac ) +func init() { + hyperkit.SetLogger(log.StandardLogger()) +} + // Process the run arguments and execute run func runHyperKit(args []string) { flags := flag.NewFlagSet("hyperkit", flag.ExitOnError) @@ -206,12 +210,15 @@ func runHyperKit(args []string) { id = strconv.Itoa(i) } if d.Size != 0 && d.Path == "" { - d.Path = filepath.Join(*state, "disk"+id+".img") + d.Path = filepath.Join(*state, "disk"+id+".raw") } if d.Path == "" { log.Fatalf("disk specified with no size or name") } - hd := hyperkit.DiskConfig{Path: d.Path, Size: d.Size} + hd, err := hyperkit.NewDisk(d.Path, d.Size) + if err != nil { + log.Fatalf("NewDisk failed: %v", err) + } h.Disks = append(h.Disks, hd) }