From 6a96049ddf24e8b929f04c7df587e66ae4d11566 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Tue, 9 May 2017 16:14:31 -0700 Subject: [PATCH 1/2] Update containerd for terminal updates Fixes #33101 This syncs up the OPOST changes for mkraw on the tty Signed-off-by: Michael Crosby --- hack/dockerfile/binaries-commits | 2 +- vendor.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/dockerfile/binaries-commits b/hack/dockerfile/binaries-commits index a0c4a73d61..d2c5891a5d 100644 --- a/hack/dockerfile/binaries-commits +++ b/hack/dockerfile/binaries-commits @@ -4,7 +4,7 @@ TOMLV_COMMIT=9baf8a8a9f2ed20a8e54160840c492f937eeaf9a # When updating RUNC_COMMIT, also update runc in vendor.conf accordingly RUNC_COMMIT=992a5be178a62e026f4069f443c6164912adbf09 -CONTAINERD_COMMIT=d24f39e203aa6be4944f06dd0fe38a618a36c764 +CONTAINERD_COMMIT=8ef7df579710405c4bb6e0812495671002ce08e0 TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574 LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e VNDR_COMMIT=c56e082291115e369f77601f9c071dd0b87c7120 diff --git a/vendor.conf b/vendor.conf index a7db427ecc..0671dd1cd6 100644 --- a/vendor.conf +++ b/vendor.conf @@ -101,7 +101,7 @@ google.golang.org/genproto b3e7c2fb04031add52c4817f53f43757ccbf9c18 github.com/docker/docker-credential-helpers v0.5.0 # containerd -github.com/docker/containerd d24f39e203aa6be4944f06dd0fe38a618a36c764 +github.com/docker/containerd 8ef7df579710405c4bb6e0812495671002ce08e0 github.com/tonistiigi/fifo 1405643975692217d6720f8b54aeee1bf2cd5cf4 # cluster From 270a33b666ff9a1b3925c5cf53c336b6fab20dc3 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Tue, 9 May 2017 16:36:17 -0700 Subject: [PATCH 2/2] Add OPOST back to !cgo build for pkg/term Signed-off-by: Michael Crosby --- pkg/term/termios_linux.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/term/termios_linux.go b/pkg/term/termios_linux.go index 22921b6aef..629eb1b13a 100644 --- a/pkg/term/termios_linux.go +++ b/pkg/term/termios_linux.go @@ -35,7 +35,7 @@ func MakeRaw(fd uintptr) (*State, error) { newState := oldState.termios newState.Iflag &^= (syscall.IGNBRK | syscall.BRKINT | syscall.PARMRK | syscall.ISTRIP | syscall.INLCR | syscall.IGNCR | syscall.ICRNL | syscall.IXON) - newState.Oflag &^= syscall.OPOST + newState.Oflag |= syscall.OPOST newState.Lflag &^= (syscall.ECHO | syscall.ECHONL | syscall.ICANON | syscall.ISIG | syscall.IEXTEN) newState.Cflag &^= (syscall.CSIZE | syscall.PARENB) newState.Cflag |= syscall.CS8