diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-10-21 16:05:53 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-10-21 16:05:53 -0700 |
| commit | 14f4113924c8b7b8c161be7335b147106d0c4a26 (patch) | |
| tree | 55997b73a8b0f8959077b12bfff9418187e8e2ac /runsc | |
| parent | b928a241efc838d378d531ba2446e8611d95c1ac (diff) | |
| parent | f03dc73f0f46d0ff1ae209fefc98ee3d7fc725d2 (diff) | |
Merge pull request #6345 from sudo-sturbia:mq/syscalls
PiperOrigin-RevId: 404901660
Diffstat (limited to 'runsc')
| -rw-r--r-- | runsc/boot/BUILD | 1 | ||||
| -rw-r--r-- | runsc/boot/vfs.go | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/runsc/boot/BUILD b/runsc/boot/BUILD index 36806b740..19328f89c 100644 --- a/runsc/boot/BUILD +++ b/runsc/boot/BUILD @@ -67,6 +67,7 @@ go_library( "//pkg/sentry/fsimpl/fuse", "//pkg/sentry/fsimpl/gofer", "//pkg/sentry/fsimpl/host", + "//pkg/sentry/fsimpl/mqfs", "//pkg/sentry/fsimpl/overlay", "//pkg/sentry/fsimpl/proc", "//pkg/sentry/fsimpl/sys", diff --git a/runsc/boot/vfs.go b/runsc/boot/vfs.go index ac1e5ac37..9f0d1ae36 100644 --- a/runsc/boot/vfs.go +++ b/runsc/boot/vfs.go @@ -36,6 +36,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/fsimpl/devtmpfs" "gvisor.dev/gvisor/pkg/sentry/fsimpl/fuse" "gvisor.dev/gvisor/pkg/sentry/fsimpl/gofer" + "gvisor.dev/gvisor/pkg/sentry/fsimpl/mqfs" "gvisor.dev/gvisor/pkg/sentry/fsimpl/overlay" "gvisor.dev/gvisor/pkg/sentry/fsimpl/proc" "gvisor.dev/gvisor/pkg/sentry/fsimpl/sys" @@ -95,6 +96,10 @@ func registerFilesystems(k *kernel.Kernel) error { AllowUserList: true, AllowUserMount: true, }) + vfsObj.MustRegisterFilesystemType(mqfs.Name, &mqfs.FilesystemType{}, &vfs.RegisterFilesystemTypeOptions{ + AllowUserMount: true, + AllowUserList: true, + }) // Setup files in devtmpfs. if err := memdev.Register(vfsObj); err != nil { |