blob: 2b81b4eca7b849c9cf5ad52dd4fdfa8c95c8dc5d (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
|
--- scripts/wsrep_sst_mariabackup.sh.orig 2019-12-11 19:29:57 UTC
+++ scripts/wsrep_sst_mariabackup.sh
@@ -605,7 +605,7 @@ recv_joiner()
set +e
if [[ $tmt -gt 0 ]] && command -v timeout >/dev/null;then
- if timeout --help | grep -q -- '-k';then
+ if timeout --help 2>&1 | grep -q -- '-k';then
ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
else
ltcmd="timeout -s9 $tmt $tcmd"
|
