diff options
author | gVisor bot <gvisor-bot@google.com> | 2021-10-06 18:35:13 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2021-10-06 18:35:13 +0000 |
commit | ae69d804af02a6ffcea3eadddbdb24c94f10f613 (patch) | |
tree | 332961ebb19ea0cc636094a4ba4674c24121375d /runsc/boot/loader.go | |
parent | e4dc34743dfddf0bfe9d54b0a40e9e95d31a9f52 (diff) | |
parent | a259115490332409b284868a0d25e39f2d63a3fe (diff) |
Merge release-20210927.0-41-ga25911549 (automated)
Diffstat (limited to 'runsc/boot/loader.go')
-rw-r--r-- | runsc/boot/loader.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go index fb67a8072..2f2d4df5e 100644 --- a/runsc/boot/loader.go +++ b/runsc/boot/loader.go @@ -241,10 +241,8 @@ func New(args Args) (*Loader, error) { // Is this a VFSv2 kernel? if args.Conf.VFS2 { kernel.VFS2Enabled = true - if args.Conf.FUSE { - kernel.FUSEEnabled = true - } - + kernel.FUSEEnabled = args.Conf.FUSE + kernel.LISAFSEnabled = args.Conf.Lisafs vfs2.Override() } |