From 30ae68b1d59a4efaf799d2aaae6b7baf09b08c5e Mon Sep 17 00:00:00 2001 From: John Howard Date: Fri, 16 Jun 2017 20:28:18 -0700 Subject: [PATCH] LCOW: Don't mount for linux containers either Signed-off-by: John Howard Upstream-commit: f8aa70055ef59e73f3c52fc028a0ad3c1634e697 Component: engine --- components/engine/daemon/daemon_windows.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/components/engine/daemon/daemon_windows.go b/components/engine/daemon/daemon_windows.go index 44593b52ff..c77f32a5ef 100644 --- a/components/engine/daemon/daemon_windows.go +++ b/components/engine/daemon/daemon_windows.go @@ -486,6 +486,11 @@ func (daemon *Daemon) runAsHyperVContainer(hostConfig *containertypes.HostConfig // conditionalMountOnStart is a platform specific helper function during the // container start to call mount. func (daemon *Daemon) conditionalMountOnStart(container *container.Container) error { + // Bail out now for Linux containers + if system.LCOWSupported() && container.Platform != "windows" { + return nil + } + // We do not mount if a Hyper-V container if !daemon.runAsHyperVContainer(container.HostConfig) { return daemon.Mount(container) @@ -496,6 +501,11 @@ func (daemon *Daemon) conditionalMountOnStart(container *container.Container) er // conditionalUnmountOnCleanup is a platform specific helper function called // during the cleanup of a container to unmount. func (daemon *Daemon) conditionalUnmountOnCleanup(container *container.Container) error { + // Bail out now for Linux containers + if system.LCOWSupported() && container.Platform != "windows" { + return nil + } + // We do not unmount if a Hyper-V container if !daemon.runAsHyperVContainer(container.HostConfig) { return daemon.Unmount(container)