From 31875af4699d46e0b5ff84af3fbf7a31005ceb3b Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Wed, 12 Jul 2017 22:56:09 +0000 Subject: [PATCH] adjust cherry-pick moby/moby@b9255e4 to work without lcow Because the LCOW support is not part of this codebase, removing the lines that expect it to be there. Signed-off-by: Andrew Hsu --- components/engine/image/tarexport/load.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/components/engine/image/tarexport/load.go b/components/engine/image/tarexport/load.go index b803214bb3..e5d465c0e9 100644 --- a/components/engine/image/tarexport/load.go +++ b/components/engine/image/tarexport/load.go @@ -397,11 +397,7 @@ func checkValidParent(img, parent *image.Image) bool { } func checkCompatibleOS(os string) error { - // TODO @jhowardmsft LCOW - revisit for simultaneous platforms platform := runtime.GOOS - if system.LCOWSupported() { - platform = "linux" - } // always compatible if the OS matches; also match an empty OS if os == platform || os == "" { return nil