diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-06-17 21:06:14 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-06-17 21:06:14 +0000 |
| commit | 4dedf67521fd0931c47bcdd7186150eb58dd1185 (patch) | |
| tree | 6d71a624b66005ff4a5e11ca5e2e5fa31788f557 /runsc | |
| parent | de4e4be19d25554a51d96789f119d06c8e66d096 (diff) | |
| parent | 3cf1644a3b4266979b7dda8b6291edf19264fa19 (diff) | |
Merge release-20210607.0-54-g3cf1644a3 (automated)
Diffstat (limited to 'runsc')
| -rw-r--r-- | runsc/boot/controller.go | 2 | ||||
| -rw-r--r-- | runsc/boot/loader.go | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/runsc/boot/controller.go b/runsc/boot/controller.go index 9b270cbf2..d52cf5a00 100644 --- a/runsc/boot/controller.go +++ b/runsc/boot/controller.go @@ -439,7 +439,7 @@ func (cm *containerManager) Restore(o *RestoreOpts, _ *struct{}) error { // Load the state. loadOpts := state.LoadOpts{Source: specFile} - if err := loadOpts.Load(ctx, k, networkStack, time.NewCalibratedClocks(), &vfs.CompleteRestoreOptions{}); err != nil { + if err := loadOpts.Load(ctx, k, nil, networkStack, time.NewCalibratedClocks(), &vfs.CompleteRestoreOptions{}); err != nil { return err } diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go index ad4d50008..8d71d7447 100644 --- a/runsc/boot/loader.go +++ b/runsc/boot/loader.go @@ -278,19 +278,15 @@ func New(args Args) (*Loader, error) { } // Create timekeeper. - tk, err := kernel.NewTimekeeper(k, vdso.ParamPage.FileRange()) - if err != nil { - return nil, fmt.Errorf("creating timekeeper: %w", err) - } + tk := kernel.NewTimekeeper(k, vdso.ParamPage.FileRange()) tk.SetClocks(time.NewCalibratedClocks()) - k.SetTimekeeper(tk) if err := enableStrace(args.Conf); err != nil { return nil, fmt.Errorf("enabling strace: %w", err) } // Create root network namespace/stack. - netns, err := newRootNetworkNamespace(args.Conf, k, k) + netns, err := newRootNetworkNamespace(args.Conf, tk, k) if err != nil { return nil, fmt.Errorf("creating network: %w", err) } @@ -332,6 +328,7 @@ func New(args Args) (*Loader, error) { // to createVFS in order to mount (among other things) procfs. if err = k.Init(kernel.InitKernelArgs{ FeatureSet: cpuid.HostFeatureSet(), + Timekeeper: tk, RootUserNamespace: creds.UserNamespace, RootNetworkNamespace: netns, ApplicationCores: uint(args.NumCPU), |