diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-09-13 17:33:07 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-09-21 19:06:12 +0000 |
| commit | 09f506930c1c585b12e9ad89044528da23d2851a (patch) | |
| tree | 54494746c618a4597d4c2a57299879565b1aaa6c /cmd/podman/create.go | |
| parent | 4f42fe2e9e35a01181031ddca07c044647d7bf04 (diff) | |
| download | podman-09f506930c1c585b12e9ad89044528da23d2851a.tar.gz podman-09f506930c1c585b12e9ad89044528da23d2851a.tar.bz2 podman-09f506930c1c585b12e9ad89044528da23d2851a.zip | |
Don't mount /dev/shm if the user told you --ipc=none
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #1466
Approved by: mheon
Diffstat (limited to 'cmd/podman/create.go')
| -rw-r--r-- | cmd/podman/create.go | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/cmd/podman/create.go b/cmd/podman/create.go index 39f6076b9..ff912560b 100644 --- a/cmd/podman/create.go +++ b/cmd/podman/create.go @@ -528,17 +528,6 @@ func parseCreateOpts(ctx context.Context, c *cli.Context, runtime *libpod.Runtim } } - shmDir := "" - if ipcMode.IsHost() { - shmDir = "/dev/shm" - } else if ipcMode.IsContainer() { - ctr, err := runtime.LookupContainer(ipcMode.Container()) - if err != nil { - return nil, errors.Wrapf(err, "container %q not found", ipcMode.Container()) - } - shmDir = ctr.ShmDir() - } - // USER user := c.String("user") if user == "" { @@ -775,7 +764,6 @@ func parseCreateOpts(ctx context.Context, c *cli.Context, runtime *libpod.Runtim Ulimit: c.StringSlice("ulimit"), }, Rm: c.Bool("rm"), - ShmDir: shmDir, StopSignal: stopSignal, StopTimeout: c.Uint("stop-timeout"), Sysctl: sysctl, |