diff options
| author | Michael Pratt <mpratt@google.com> | 2019-01-02 15:46:40 -0800 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2019-01-02 15:48:00 -0800 |
| commit | 33191e1cc4010693c434b24baa4d830d082c8ce6 (patch) | |
| tree | eeb237162748470c7c9763ff0a14fef0ca4c1225 /runsc/main.go | |
| parent | 8e586db16274c2563fb13c95bafa9e20ea3d73ce (diff) | |
Automated rollback of changelist 225089593
PiperOrigin-RevId: 227595007
Change-Id: If14cc5aab869c5fd7a4ebd95929c887ab690e94c
Diffstat (limited to 'runsc/main.go')
| -rw-r--r-- | runsc/main.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/runsc/main.go b/runsc/main.go index a6ea0e9fa..e036abc44 100644 --- a/runsc/main.go +++ b/runsc/main.go @@ -62,8 +62,7 @@ var ( fileAccess = flag.String("file-access", "exclusive", "specifies which filesystem to use for the root mount: exclusive (default), shared. Volume mounts are always shared.") overlay = flag.Bool("overlay", false, "wrap filesystem mounts with writable overlay. All modifications are stored in memory inside the sandbox.") watchdogAction = flag.String("watchdog-action", "log", "sets what action the watchdog takes when triggered: log (default), panic.") - panicSignal = flag.Int("panic-signal", -1, "register signal handling that panics. Usually set to SIGUSR2(12) to troubleshoot hangs. -1 disables it. This takes precendence over -trace-signal.") - traceSignal = flag.Int("trace-signal", -1, "register signal handling that logs a traceback of all goroutines. Usually set to SIGUSR2(12) to troubleshoot hangs. -1 disables it.") + panicSignal = flag.Int("panic-signal", -1, "register signal handling that panics. Usually set to SIGUSR2(12) to troubleshoot hangs. -1 disables it.") 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.") ) @@ -147,7 +146,6 @@ func main() { StraceLogSize: *straceLogSize, WatchdogAction: wa, PanicSignal: *panicSignal, - TraceSignal: *traceSignal, TestOnlyAllowRunAsCurrentUserWithoutChroot: *testOnlyAllowRunAsCurrentUserWithoutChroot, } if len(*straceSyscalls) != 0 { |