fleetctl: fixed broken ssh terminal coreos#1499

endocode · Mar 11, 2016 · 38e6079 · 38e6079
1 parent 83c4099
commit 38e6079
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/ssh/ssh.go b/ssh/ssh.go
@@ -66,10 +66,6 @@ func makeSession(client *SSHForwardingClient) (session *gossh.Session, finalize
 		return
 	}
 
-	session.Stdout = os.Stdout
-	session.Stderr = os.Stderr
-	session.Stdin = os.Stdin
-
 	modes := gossh.TerminalModes{
 		gossh.ECHO:          1,     // enable echoing
 		gossh.TTY_OP_ISPEED: 14400, // input speed = 14.4kbaud
@@ -116,6 +112,9 @@ func Execute(client *SSHForwardingClient, cmd string) (error, int) {
 		return err, -1
 	}
 
+	session.Stdout = os.Stdout
+	session.Stderr = os.Stderr
+
 	defer finalize()
 
 	session.Start(cmd)
@@ -142,6 +141,10 @@ func Shell(client *SSHForwardingClient) error {
 		return err
 	}
 
+	session.Stdout = os.Stdout
+	session.Stderr = os.Stderr
+	session.Stdin = os.Stdin
+
 	defer finalize()
 
 	if err = session.Shell(); err != nil {