diff options
| author | Fabricio Voznika <fvoznika@google.com> | 2020-07-08 17:10:35 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-07-08 17:12:29 -0700 |
| commit | c4815af9475cc4680c6d598d9c930de892c98aae (patch) | |
| tree | 70ed0957bbb522da0bd268ea14ae3ac066c477d2 /pkg/sentry/fsimpl | |
| parent | 4f7af437e25382bdf75b880d1bf3184eae725231 (diff) | |
Add shared mount hints to VFS2
Container restart test is disabled for VFS2 for now.
Updates #1487
PiperOrigin-RevId: 320296401
Diffstat (limited to 'pkg/sentry/fsimpl')
| -rw-r--r-- | pkg/sentry/fsimpl/testutil/kernel.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pkg/sentry/fsimpl/testutil/kernel.go b/pkg/sentry/fsimpl/testutil/kernel.go index ecc81e6bf..e743e8114 100644 --- a/pkg/sentry/fsimpl/testutil/kernel.go +++ b/pkg/sentry/fsimpl/testutil/kernel.go @@ -62,6 +62,7 @@ func Boot() (*kernel.Kernel, error) { return nil, fmt.Errorf("creating platform: %v", err) } + kernel.VFS2Enabled = true k := &kernel.Kernel{ Platform: plat, } @@ -103,11 +104,6 @@ func Boot() (*kernel.Kernel, error) { return nil, fmt.Errorf("initializing kernel: %v", err) } - kernel.VFS2Enabled = true - - if err := k.VFS().Init(); err != nil { - return nil, fmt.Errorf("VFS init: %v", err) - } k.VFS().MustRegisterFilesystemType(tmpfs.Name, &tmpfs.FilesystemType{}, &vfs.RegisterFilesystemTypeOptions{ AllowUserMount: true, AllowUserList: true, |