浏览代码

Merge pull request #33128 from crosbymichael/update-containerd-2x

Update containerd for terminal updates
Brian Goff 8 年之前
父节点
当前提交
a46f7bd5bd
共有 3 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      hack/dockerfile/binaries-commits
  2. 1 1
      pkg/term/termios_linux.go
  3. 1 1
      vendor.conf

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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