diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-10-15 01:46:20 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-10-15 01:46:20 +0000 |
| commit | 8d5428e2668e1af6d6801af4337b4274c69f72db (patch) | |
| tree | c5a6981b075f73476c71f1c72d1ead84ee12a77f /runsc/boot | |
| parent | d75b58d63ab2dd2509a387530b899545c0d36917 (diff) | |
| parent | 33b41d8fe98e7820118e8d42b0cfbec4ca159d62 (diff) | |
Merge release-20211005.0-47-g33b41d8fe (automated)
Diffstat (limited to 'runsc/boot')
| -rw-r--r-- | runsc/boot/loader.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go index 2f2d4df5e..28dbbcf1f 100644 --- a/runsc/boot/loader.go +++ b/runsc/boot/loader.go @@ -340,6 +340,7 @@ func New(args Args) (*Loader, error) { if args.TotalMem > 0 { // Adjust the total memory returned by the Sentry so that applications that // use /proc/meminfo can make allocations based on this limit. + usage.MinimumTotalMemoryBytes = args.TotalMem usage.MaximumTotalMemoryBytes = args.TotalMem log.Infof("Setting total memory to %.2f GB", float64(args.TotalMem)/(1<<30)) } |