summaryrefslogtreecommitdiffhomepage
path: root/runsc/boot
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-07-23 23:37:23 +0000
committergVisor bot <gvisor-bot@google.com>2020-07-23 23:37:23 +0000
commit889487928af61ef0544f8bec6c3d35fd423905c3 (patch)
tree28dfaeea4ae4bc04e016061ca36c6798ad03f43b /runsc/boot
parent1d05051701a6f92a093b8948b58f4bf2128eebdd (diff)
parent5e34ee68c93888eba3d56a2b713dbeebf406efa3 (diff)
Merge release-20200622.1-206-g5e34ee68c (automated)
Diffstat (limited to 'runsc/boot')
-rw-r--r--runsc/boot/vfs.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/runsc/boot/vfs.go b/runsc/boot/vfs.go
index 56f4ba15d..9a1ed8e9e 100644
--- a/runsc/boot/vfs.go
+++ b/runsc/boot/vfs.go
@@ -77,6 +77,10 @@ func registerFilesystems(k *kernel.Kernel) error {
AllowUserMount: true,
AllowUserList: true,
})
+ vfsObj.MustRegisterFilesystemType(fuse.Name, &fuse.FilesystemType{}, &vfs.RegisterFilesystemTypeOptions{
+ AllowUserMount: true,
+ AllowUserList: true,
+ })
// Setup files in devtmpfs.
if err := memdev.Register(vfsObj); err != nil {
@@ -119,6 +123,7 @@ func registerFilesystems(k *kernel.Kernel) error {
return fmt.Errorf("creating fusedev devtmpfs files: %w", err)
}
}
+
return nil
}