From 317ddb09dfde9d594912f0a2055a1a5883f5d0a6 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 4 Aug 2017 11:42:30 +0100 Subject: [PATCH] Do not try to autodetect UEFI mode Signed-off-by: Justin Cormack --- src/cmd/linuxkit/run_hyperkit.go | 4 +++- src/cmd/linuxkit/run_qemu.go | 5 ----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/cmd/linuxkit/run_hyperkit.go b/src/cmd/linuxkit/run_hyperkit.go index c909ff650..4fdf5f9d2 100644 --- a/src/cmd/linuxkit/run_hyperkit.go +++ b/src/cmd/linuxkit/run_hyperkit.go @@ -92,7 +92,9 @@ func runHyperKit(args []string) { *isoBoot = true prefix = strings.TrimSuffix(path, ".iso") // hyperkit only supports UEFI ISO boot at present - *uefiBoot = true + if !*uefiBoot { + log.Fatalf("Hyperkit requires --uefi to be set to boot an ISO") + } } } diff --git a/src/cmd/linuxkit/run_qemu.go b/src/cmd/linuxkit/run_qemu.go index 3f7fc013c..b18fa20c0 100644 --- a/src/cmd/linuxkit/run_qemu.go +++ b/src/cmd/linuxkit/run_qemu.go @@ -174,11 +174,6 @@ func runQemu(args []string) { *isoBoot = true prefix = strings.TrimSuffix(path, ".iso") } - // autodetect EFI ISO from our default naming - if strings.HasSuffix(path, "-efi.iso") { - *uefiBoot = true - prefix = strings.TrimSuffix(path, "-efi.iso") - } } if *state == "" {