diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2018-04-24 16:41:42 +0200 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-05-04 17:15:55 +0000 |
| commit | 522a7197a88ab4e3730387df33f22e445f0f8f3c (patch) | |
| tree | b9ff641842314b447296d18c072eb478d9742632 /libpod/runtime_ctr.go | |
| parent | 73078fabcfd2420c47e41843da71dd993f9a0a3e (diff) | |
| download | podman-522a7197a88ab4e3730387df33f22e445f0f8f3c.tar.gz podman-522a7197a88ab4e3730387df33f22e445f0f8f3c.tar.bz2 podman-522a7197a88ab4e3730387df33f22e445f0f8f3c.zip | |
podman, userNS: configure an intermediate mount namespace
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Closes: #690
Approved by: mheon
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 3f27df5b9..4708e0c8f 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -76,7 +76,11 @@ func (r *Runtime) NewContainer(ctx context.Context, rSpec *spec.Spec, options .. ctr.config.LogPath = filepath.Join(ctr.config.StaticDir, "ctr.log") } if ctr.config.ShmDir == "" { - ctr.config.ShmDir = filepath.Join(ctr.bundlePath(), "shm") + if ctr.state.UserNSRoot == "" { + ctr.config.ShmDir = filepath.Join(ctr.bundlePath(), "shm") + } else { + ctr.config.ShmDir = filepath.Join(ctr.state.UserNSRoot, "shm") + } if err := os.MkdirAll(ctr.config.ShmDir, 0700); err != nil { if !os.IsExist(err) { return nil, errors.Wrapf(err, "unable to create shm %q dir", ctr.config.ShmDir) |