diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-05-26 02:02:23 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-05-26 02:02:23 +0000 |
| commit | 014a4bec310ce657c40a620cdcedb7c868a34631 (patch) | |
| tree | e7368cf9ce9ef8597256d928785b0d73c2b151ed /runsc/boot | |
| parent | e0fb3733a007b361d8683e9f9b50ccbc66e1c9e5 (diff) | |
| parent | b63e61828d0652ad1769db342c17a3529d2d24ed (diff) | |
Merge release-20210518.0-44-gb63e61828 (automated)
Diffstat (limited to 'runsc/boot')
| -rw-r--r-- | runsc/boot/loader.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go index 0c3bb1800..efa014b25 100644 --- a/runsc/boot/loader.go +++ b/runsc/boot/loader.go @@ -287,6 +287,7 @@ func New(args Args) (*Loader, error) { return nil, fmt.Errorf("creating timekeeper: %w", err) } tk.SetClocks(time.NewCalibratedClocks()) + k.SetTimekeeper(tk) if err := enableStrace(args.Conf); err != nil { return nil, fmt.Errorf("enabling strace: %w", err) @@ -335,7 +336,6 @@ 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), |