From c4815af9475cc4680c6d598d9c930de892c98aae Mon Sep 17 00:00:00 2001 From: Fabricio Voznika Date: Wed, 8 Jul 2020 17:10:35 -0700 Subject: Add shared mount hints to VFS2 Container restart test is disabled for VFS2 for now. Updates #1487 PiperOrigin-RevId: 320296401 --- runsc/boot/loader.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'runsc/boot/loader.go') diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go index 0940d2a6d..0c0423ab2 100644 --- a/runsc/boot/loader.go +++ b/runsc/boot/loader.go @@ -298,6 +298,12 @@ func New(args Args) (*Loader, error) { return nil, fmt.Errorf("initializing kernel: %v", err) } + if kernel.VFS2Enabled { + if err := registerFilesystems(k); err != nil { + return nil, fmt.Errorf("registering filesystems: %w", err) + } + } + if err := adjustDirentCache(k); err != nil { return nil, err } @@ -559,7 +565,7 @@ func (l *Loader) run() error { l.startGoferMonitor(l.sandboxID, l.goferFDs) mntr := newContainerMounter(l.spec, l.goferFDs, l.k, l.mountHints) - if err := mntr.processHints(l.conf); err != nil { + if err := mntr.processHints(l.conf, l.rootProcArgs.Credentials); err != nil { return err } if err := setupContainerFS(ctx, l.conf, mntr, &l.rootProcArgs); err != nil { -- cgit v1.2.3