diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2022-03-28 09:10:14 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2022-04-12 13:35:51 -0400 |
| commit | 3987c529f473178c51feb69d5252c7d5c2a8f697 (patch) | |
| tree | 3c299765c94c8867d8d10efef719eab864490a10 /libpod/runtime_ctr.go | |
| parent | 87d129e805c993acbc571597baba8101afd475fe (diff) | |
| download | podman-3987c529f473178c51feb69d5252c7d5c2a8f697.tar.gz podman-3987c529f473178c51feb69d5252c7d5c2a8f697.tar.bz2 podman-3987c529f473178c51feb69d5252c7d5c2a8f697.zip | |
Add support for ipc namespace modes "none, private, sharable"
Fixes: #13265
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index f92898b1c..7edd49fd1 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -174,6 +174,8 @@ func (r *Runtime) initContainerVariables(rSpec *spec.Spec, config *ContainerConf return nil, errors.Wrapf(err, "converting containers.conf ShmSize %s to an int", r.config.Containers.ShmSize) } ctr.config.ShmSize = size + ctr.config.NoShm = false + ctr.config.NoShmShare = false ctr.config.StopSignal = 15 ctr.config.StopTimeout = r.config.Engine.StopTimeout @@ -514,7 +516,7 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container) (_ *Contai } } - if !MountExists(ctr.config.Spec.Mounts, "/dev/shm") && ctr.config.ShmDir == "" { + if !MountExists(ctr.config.Spec.Mounts, "/dev/shm") && ctr.config.ShmDir == "" && !ctr.config.NoShm { ctr.config.ShmDir = filepath.Join(ctr.bundlePath(), "shm") if err := os.MkdirAll(ctr.config.ShmDir, 0700); err != nil { if !os.IsExist(err) { |