diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-12-17 23:21:18 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-12-17 23:21:18 +0000 |
| commit | 7868f5a23b07ec1057e2ef34a7b526708f04bd28 (patch) | |
| tree | 99865103d693fcd1ab85ce635b7b9753e9a128b1 /runsc/main.go | |
| parent | 10ff034b94702f317135ce51a52b3d19236f2594 (diff) | |
| parent | 725e73eed081a5a063054511da63d0771f6705a1 (diff) | |
Merge release-20191210.0-46-g725e73e (automated)
Diffstat (limited to 'runsc/main.go')
| -rw-r--r-- | runsc/main.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runsc/main.go b/runsc/main.go index 4682b308c..abf929511 100644 --- a/runsc/main.go +++ b/runsc/main.go @@ -82,6 +82,7 @@ var ( numNetworkChannels = flag.Int("num-network-channels", 1, "number of underlying channels(FDs) to use for network link endpoints.") rootless = flag.Bool("rootless", false, "it allows the sandbox to be started with a user that is not root. Sandbox and Gofer processes may run with same privileges as current user.") referenceLeakMode = flag.String("ref-leak-mode", "disabled", "sets reference leak check mode: disabled (default), log-names, log-traces.") + cpuNumFromQuota = flag.Bool("cpu-num-from-quota", false, "set cpu number to cpu quota (least integer greater or equal to quota value, but not less than 2)") // Test flags, not to be used outside tests, ever. testOnlyAllowRunAsCurrentUserWithoutChroot = flag.Bool("TESTONLY-unsafe-nonroot", false, "TEST ONLY; do not ever use! This skips many security measures that isolate the host from the sandbox.") @@ -225,6 +226,7 @@ func main() { AlsoLogToStderr: *alsoLogToStderr, ReferenceLeakMode: refsLeakMode, OverlayfsStaleRead: *overlayfsStaleRead, + CPUNumFromQuota: *cpuNumFromQuota, TestOnlyAllowRunAsCurrentUserWithoutChroot: *testOnlyAllowRunAsCurrentUserWithoutChroot, TestOnlyTestNameEnv: *testOnlyTestNameEnv, |