From 2787997349b7266990bbdeee60de627e604b32a4 Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Sun, 27 Jan 2013 00:49:09 -0800 Subject: [PATCH] Create empty mountpoints (./rw and ./rootfs) every time we create or load a container Upstream-commit: b6fb5bb21b73c90ae1833e32867781824f66ffb7 Component: engine --- components/engine/container.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/components/engine/container.go b/components/engine/container.go index 5b1eceba0b..fcdce43eff 100644 --- a/components/engine/container.go +++ b/components/engine/container.go @@ -59,6 +59,9 @@ func createContainer(id string, root string, command string, args []string, laye stdoutLog: new(bytes.Buffer), stderrLog: new(bytes.Buffer), } + if err := container.Filesystem.createMountPoints(); err != nil { + return nil, err + } container.stdout.AddWriter(NopWriteCloser(container.stdoutLog)) container.stderr.AddWriter(NopWriteCloser(container.stderrLog)) @@ -89,6 +92,9 @@ func loadContainer(containerPath string) (*Container, error) { if err := json.Unmarshal(data, container); err != nil { return nil, err } + if err := container.Filesystem.createMountPoints(); err != nil { + return nil, err + } container.State = newState() return container, nil }