summaryrefslogtreecommitdiffhomepage
path: root/runsc/boot/loader.go
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-07-15 19:17:43 +0000
committergVisor bot <gvisor-bot@google.com>2020-07-15 19:17:43 +0000
commit22cc435645568eb94edb4dcdb6f97c86247bed71 (patch)
tree53ab2cf41b1aa62c28e82b8c09dc9b50cc01435f /runsc/boot/loader.go
parent607170858082259134ebd03005e9994ae7b5c088 (diff)
parent8939fae0af9dc8e1cdf2553339fee35b684fc828 (diff)
Merge release-20200622.1-160-g8939fae0a (automated)
Diffstat (limited to 'runsc/boot/loader.go')
-rw-r--r--runsc/boot/loader.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go
index a48547ea5..9cd9c5909 100644
--- a/runsc/boot/loader.go
+++ b/runsc/boot/loader.go
@@ -205,6 +205,10 @@ 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
+ }
+
vfs2.Override()
}