diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-10-28 00:31:28 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-10-28 00:31:28 +0000 |
| commit | ff7fcf2e0e894fbcb7b5aced4a29947e8ab185ea (patch) | |
| tree | e22f2631ab76815deb44c55ca30ab4489cc5d860 /runsc/specutils | |
| parent | b6aec86b75a79678fc450cccb2a3b2d94fd84897 (diff) | |
| parent | 013d79d8e4e008f113004e766986ac89474b210d (diff) | |
Merge release-20201019.0-72-g013d79d8e (automated)
Diffstat (limited to 'runsc/specutils')
| -rw-r--r-- | runsc/specutils/specutils.go | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/runsc/specutils/specutils.go b/runsc/specutils/specutils.go index 33fa2ddd9..45abc1425 100644 --- a/runsc/specutils/specutils.go +++ b/runsc/specutils/specutils.go @@ -344,15 +344,9 @@ func IsSupportedDevMount(m specs.Mount) bool { var existingDevices = []string{ "/dev/fd", "/dev/stdin", "/dev/stdout", "/dev/stderr", "/dev/null", "/dev/zero", "/dev/full", "/dev/random", - "/dev/urandom", "/dev/shm", "/dev/pts", "/dev/ptmx", + "/dev/urandom", "/dev/shm", "/dev/ptmx", } dst := filepath.Clean(m.Destination) - if dst == "/dev" { - // OCI spec uses many different mounts for the things inside of '/dev'. We - // have a single mount at '/dev' that is always mounted, regardless of - // whether it was asked for, as the spec says we SHOULD. - return false - } for _, dev := range existingDevices { if dst == dev || strings.HasPrefix(dst, dev+"/") { return false |