Browse code
Merge pull request #33128 from crosbymichael/update-containerd-2x
Update containerd for terminal updates
Brian Goff authored on 2017/05/11 05:45:11Showing 3 changed files
| ... | ... |
@@ -4,7 +4,7 @@ TOMLV_COMMIT=9baf8a8a9f2ed20a8e54160840c492f937eeaf9a |
| 4 | 4 |
|
| 5 | 5 |
# When updating RUNC_COMMIT, also update runc in vendor.conf accordingly |
| 6 | 6 |
RUNC_COMMIT=992a5be178a62e026f4069f443c6164912adbf09 |
| 7 |
-CONTAINERD_COMMIT=d24f39e203aa6be4944f06dd0fe38a618a36c764 |
|
| 7 |
+CONTAINERD_COMMIT=8ef7df579710405c4bb6e0812495671002ce08e0 |
|
| 8 | 8 |
TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574 |
| 9 | 9 |
LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e |
| 10 | 10 |
VNDR_COMMIT=c56e082291115e369f77601f9c071dd0b87c7120 |
| ... | ... |
@@ -35,7 +35,7 @@ func MakeRaw(fd uintptr) (*State, error) {
|
| 35 | 35 |
newState := oldState.termios |
| 36 | 36 |
|
| 37 | 37 |
newState.Iflag &^= (syscall.IGNBRK | syscall.BRKINT | syscall.PARMRK | syscall.ISTRIP | syscall.INLCR | syscall.IGNCR | syscall.ICRNL | syscall.IXON) |
| 38 |
- newState.Oflag &^= syscall.OPOST |
|
| 38 |
+ newState.Oflag |= syscall.OPOST |
|
| 39 | 39 |
newState.Lflag &^= (syscall.ECHO | syscall.ECHONL | syscall.ICANON | syscall.ISIG | syscall.IEXTEN) |
| 40 | 40 |
newState.Cflag &^= (syscall.CSIZE | syscall.PARENB) |
| 41 | 41 |
newState.Cflag |= syscall.CS8 |
| ... | ... |
@@ -101,7 +101,7 @@ google.golang.org/genproto b3e7c2fb04031add52c4817f53f43757ccbf9c18 |
| 101 | 101 |
github.com/docker/docker-credential-helpers v0.5.0 |
| 102 | 102 |
|
| 103 | 103 |
# containerd |
| 104 |
-github.com/docker/containerd d24f39e203aa6be4944f06dd0fe38a618a36c764 |
|
| 104 |
+github.com/docker/containerd 8ef7df579710405c4bb6e0812495671002ce08e0 |
|
| 105 | 105 |
github.com/tonistiigi/fifo 1405643975692217d6720f8b54aeee1bf2cd5cf4 |
| 106 | 106 |
|
| 107 | 107 |
# cluster |