diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-05-28 19:28:28 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-05-28 19:28:28 +0000 |
| commit | 3f6e6c2d4236127b5db2264f738bbfc08e218431 (patch) | |
| tree | 3bcbe124876d8b6bc96cf03780624275a448e9ab /runsc/boot/vfs.go | |
| parent | c6ac1abc16b544644cdced8e4514fb79636195ce (diff) | |
| parent | a8c1b326600983abeabd41cbfa0c32ff84cf475a (diff) | |
Merge release-20200522.0-21-ga8c1b326 (automated)
Diffstat (limited to 'runsc/boot/vfs.go')
| -rw-r--r-- | runsc/boot/vfs.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/runsc/boot/vfs.go b/runsc/boot/vfs.go index 147c901c4..fefeeff58 100644 --- a/runsc/boot/vfs.go +++ b/runsc/boot/vfs.go @@ -235,7 +235,7 @@ func (c *containerMounter) prepareMountsVFS2() ([]mountAndFD, error) { fd := -1 // Only bind mounts use host FDs; see // containerMounter.getMountNameAndOptionsVFS2. - if m.Type == bind || isBindMount(m) { + if m.Type == bind { fd = c.fds.remove() } mounts = append(mounts, mountAndFD{ @@ -305,10 +305,6 @@ func (c *containerMounter) getMountNameAndOptionsVFS2(conf *Config, m *mountAndF useOverlay bool ) - if isBindMount(m.Mount) { - m.Type = bind - } - switch m.Type { case devpts.Name, devtmpfs.Name, proc.Name, sys.Name: fsName = m.Type |