summaryrefslogtreecommitdiffhomepage
path: root/runsc/boot/fds.go
diff options
context:
space:
mode:
authorDean Deng <deandeng@google.com>2020-04-24 10:02:22 -0700
committergVisor bot <gvisor-bot@google.com>2020-04-24 10:03:43 -0700
commit1b88c63b3e6b330c8399bf92f148cc80374bee18 (patch)
tree34606e57da3b91bd210ad5f9949412a9ad097b4a /runsc/boot/fds.go
parent40a712c57cd78c51c9875ae04b5e795113c75e62 (diff)
Move hostfs mount to Kernel struct.
This is needed to set up host fds passed through a Unix socket. Note that the host package depends on kernel, so we cannot set up the hostfs mount directly in Kernel.Init as we do for sockfs and pipefs. Also, adjust sockfs to make its setup look more like hostfs's and pipefs's. PiperOrigin-RevId: 308274053
Diffstat (limited to 'runsc/boot/fds.go')
-rw-r--r--runsc/boot/fds.go7
1 files changed, 1 insertions, 6 deletions
diff --git a/runsc/boot/fds.go b/runsc/boot/fds.go
index 7e49f6f9f..0cbd63857 100644
--- a/runsc/boot/fds.go
+++ b/runsc/boot/fds.go
@@ -89,14 +89,9 @@ func createFDTableVFS2(ctx context.Context, console bool, stdioFDs []int) (*kern
fdTable := k.NewFDTable()
defer fdTable.DecRef()
- hostMount, err := vfshost.NewMount(k.VFS())
- if err != nil {
- return nil, fmt.Errorf("creating host mount: %w", err)
- }
-
for appFD, hostFD := range stdioFDs {
// TODO(gvisor.dev/issue/1482): Add TTY support.
- appFile, err := vfshost.ImportFD(hostMount, hostFD, false)
+ appFile, err := vfshost.ImportFD(k.HostMount(), hostFD, false)
if err != nil {
return nil, err
}