diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-01 18:15:36 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-01 18:15:36 +0000 |
| commit | f5181c6067ad420d16557d21734453994fb42791 (patch) | |
| tree | 58e768fc08664c0dd37b69bf5bfff42cb88ca7c9 /runsc/cmd/gofer.go | |
| parent | 964da19b9b3361162209ad820eab7a957d10bc20 (diff) | |
| parent | 71589b7f7e69b85820c9deb75fc6d0b6c5f00eb1 (diff) | |
Merge release-20200818.0-99-g71589b7f7 (automated)
Diffstat (limited to 'runsc/cmd/gofer.go')
| -rw-r--r-- | runsc/cmd/gofer.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runsc/cmd/gofer.go b/runsc/cmd/gofer.go index 7da02c3af..bba00d551 100644 --- a/runsc/cmd/gofer.go +++ b/runsc/cmd/gofer.go @@ -100,15 +100,15 @@ func (g *Gofer) Execute(_ context.Context, f *flag.FlagSet, args ...interface{}) return subcommands.ExitUsageError } + conf := args[0].(*config.Config) + specFile := os.NewFile(uintptr(g.specFD), "spec file") defer specFile.Close() - spec, err := specutils.ReadSpecFromFile(g.bundleDir, specFile) + spec, err := specutils.ReadSpecFromFile(g.bundleDir, specFile, conf) if err != nil { Fatalf("reading spec: %v", err) } - conf := args[0].(*config.Config) - if g.setUpRoot { if err := setupRootFS(spec, conf); err != nil { Fatalf("Error setting up root FS: %v", err) |