merge branch 'pr-1560'
Check error return values LGTMs: @crosbymichael @cyphar Closes #1560
This commit is contained in:
commit
59bbdc41a3
|
@ -75,11 +75,15 @@ func (h *signalHandler) forward(process *libcontainer.Process, tty *tty, detach
|
|||
}
|
||||
|
||||
// perform the initial tty resize.
|
||||
tty.resize()
|
||||
if err := tty.resize(); err != nil {
|
||||
logrus.Error(err)
|
||||
}
|
||||
for s := range h.signals {
|
||||
switch s {
|
||||
case unix.SIGWINCH:
|
||||
tty.resize()
|
||||
if err := tty.resize(); err != nil {
|
||||
logrus.Error(err)
|
||||
}
|
||||
case unix.SIGCHLD:
|
||||
exits, err := h.reap()
|
||||
if err != nil {
|
||||
|
|
|
@ -371,7 +371,10 @@ func startContainer(context *cli.Context, spec *specs.Spec, action CtAct, criuOp
|
|||
}
|
||||
|
||||
if notifySocket != nil {
|
||||
notifySocket.setupSocket()
|
||||
err := notifySocket.setupSocket()
|
||||
if err != nil {
|
||||
return -1, err
|
||||
}
|
||||
}
|
||||
|
||||
// Support on-demand socket activation by passing file descriptors into the container init process.
|
||||
|
|
Loading…
Reference in New Issue