tty not required for setup

Signed-off-by: Mrunal Patel <mrunalp@gmail.com> (github: mrunalp)
docker-archive · Jan 15, 2015 · 96e6ee6 · 96e6ee6
1 parent 0c50197
commit 96e6ee6
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/nsinit/exec.go b/nsinit/exec.go
@@ -84,7 +84,7 @@ func startInExistingContainer(config *libcontainer.Config, state *libcontainer.S
 	)
 	signal.Notify(sigc)
 
-	if config.Tty {
+	if config.Tty && action != "setup" {
 		stdin = nil
 		stdout = nil
 		stderr = nil
@@ -97,14 +97,12 @@ func startInExistingContainer(config *libcontainer.Config, state *libcontainer.S
 		go io.Copy(master, os.Stdin)
 		go io.Copy(os.Stdout, master)
 
-		/*
-			state, err := term.SetRawTerminal(os.Stdin.Fd())
-			if err != nil {
-				return -1, err
-			}
+		state, err := term.SetRawTerminal(os.Stdin.Fd())
+		if err != nil {
+			return -1, err
+		}
 
-			defer term.RestoreTerminal(os.Stdin.Fd(), state)
-		*/
+		defer term.RestoreTerminal(os.Stdin.Fd(), state)
 	}
 
 	startCallback := func(cmd *exec.Cmd) {