Don't use tty in remote exec

virtctl vnc didn't work with CRI-O, because the remote exec command in virt-api converted LFs into CR + LF, which broke the VNC network protocol. The root cause for this is that this seems to be a default behaviour of tty, see moby/moby#8513 (comment). The solution is to not use tty, we don't need it. (Still unclear why this only happened with CRI-O) Signed-off-by: Marc Sluiter <[email protected]>
webe745 · Sep 17, 2018 · 566065a · 566065a
1 parent 852421e
commit 566065a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/cmd/virt-launcher/sock-connector b/cmd/virt-launcher/sock-connector
@@ -29,5 +29,4 @@ if ! [ -S "$SOCKET" ]; then
 	exit 1
 fi
 
-stty -echo
-socat unix-connect:/$SOCKET stdio,cfmakeraw
+socat unix-connect:/$SOCKET stdio
diff --git a/pkg/virt-api/rest/subresource.go b/pkg/virt-api/rest/subresource.go
@@ -228,7 +228,7 @@ func remoteExecHelper(podName string, namespace string, cmd []string, in io.Read
 		Stdin:     true,
 		Stdout:    true,
 		Stderr:    true,
-		TTY:       true,
+		TTY:       false,
 	}, scheme.ParameterCodec)
 
 	// execute request