linux: fix runtime-root propagation

faf2781dd2 fixed the propagation for
ShimRemote but ShimLocal was not fixed in the commit.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
This commit is contained in:
Akihiro Suda
2018-03-02 15:29:49 +09:00
parent e6a3dd3550
commit 125fdeff8a
5 changed files with 203 additions and 19 deletions

View File

@@ -38,10 +38,11 @@ import (
)
var (
address string
noDaemon bool
noCriu bool
supportsCriu bool
address string
noDaemon bool
noCriu bool
supportsCriu bool
testNamespace = "testing"
ctrd = &daemon{}
)
@@ -58,7 +59,7 @@ func init() {
func testContext() (context.Context, context.CancelFunc) {
ctx, cancel := context.WithCancel(context.Background())
ctx = namespaces.WithNamespace(ctx, "testing")
ctx = namespaces.WithNamespace(ctx, testNamespace)
return ctx, cancel
}