summaryrefslogtreecommitdiffhomepage
path: root/runsc/cmd
diff options
context:
space:
mode:
authorFabricio Voznika <fvoznika@google.com>2018-05-02 17:39:12 -0700
committerShentubot <shentubot@google.com>2018-05-02 17:40:01 -0700
commita61def1b368a9042e346787008e12770e4e67b35 (patch)
tree471e9c844c6dc5d6cd8e6949a47d78c52132d3b0 /runsc/cmd
parent6c061ad913fce6fbfe9a98c0fc1f5b67fad1b9b0 (diff)
Remove detach for exec options
Detachable exec commands are handled in the client entirely and the detach option is not used anymore. PiperOrigin-RevId: 195181272 Change-Id: I6e82a2876d2c173709c099be59670f71702e5bf0
Diffstat (limited to 'runsc/cmd')
-rw-r--r--runsc/cmd/exec.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/runsc/cmd/exec.go b/runsc/cmd/exec.go
index 8379f552d..576031b5b 100644
--- a/runsc/cmd/exec.go
+++ b/runsc/cmd/exec.go
@@ -99,7 +99,6 @@ func (ex *Exec) Execute(_ context.Context, f *flag.FlagSet, args ...interface{})
if err != nil {
Fatalf("error parsing process spec: %v", err)
}
- e.Detach = ex.detach
conf := args[0].(*boot.Config)
waitStatus := args[1].(*syscall.WaitStatus)
@@ -123,7 +122,7 @@ func (ex *Exec) Execute(_ context.Context, f *flag.FlagSet, args ...interface{})
// executed. If detach was specified, starts a child in non-detach mode,
// write the child's PID to the pid file. So when the container returns, the
// child process will also return and signal containerd.
- if e.Detach {
+ if ex.detach {
binPath, err := specutils.BinPath()
if err != nil {
Fatalf("error getting bin path: %v", err)