summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-03-14 01:04:10 +0100
committerGitHub <noreply@github.com>2020-03-14 01:04:10 +0100
commit8b07ad1138bea8dfa71890c22e811bdd809b4e7e (patch)
tree9e431fda10668cfcc7cb60952a641d0d30c5ff0e /pkg
parent16536af1131cd58d3a9a272d081d0b848d806e28 (diff)
parente6fba1e44898304a0c5560aaecdee53beda1034f (diff)
downloadpodman-8b07ad1138bea8dfa71890c22e811bdd809b4e7e.tar.gz
podman-8b07ad1138bea8dfa71890c22e811bdd809b4e7e.tar.bz2
podman-8b07ad1138bea8dfa71890c22e811bdd809b4e7e.zip
Merge pull request #5496 from baude/preemptive
eat signal 23 in signal proxy
Diffstat (limited to 'pkg')
-rw-r--r--pkg/adapter/sigproxy_linux.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkg/adapter/sigproxy_linux.go b/pkg/adapter/sigproxy_linux.go
index 8295e4250..5695d0e42 100644
--- a/pkg/adapter/sigproxy_linux.go
+++ b/pkg/adapter/sigproxy_linux.go
@@ -20,7 +20,10 @@ func ProxySignals(ctr *libpod.Container) {
for s := range sigBuffer {
// Ignore SIGCHLD and SIGPIPE - these are mostly likely
// intended for the podman command itself.
- if s == syscall.SIGCHLD || s == syscall.SIGPIPE {
+ // SIGURG was added because of golang 1.14 and its preemptive changes
+ // causing more signals to "show up".
+ // https://github.com/containers/libpod/issues/5483
+ if s == syscall.SIGCHLD || s == syscall.SIGPIPE || s == syscall.SIGURG {
continue
}