blob: 291b11edadbe45faa2f5b1fccef7e3329c7d9a61 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
|
--- scripts/wsrep_sst_mariabackup.sh.orig 2021-06-24 09:33:04 UTC
+++ scripts/wsrep_sst_mariabackup.sh
@@ -696,7 +696,7 @@ recv_joiner()
local ltcmd="$tcmd"
if [ $tmt -gt 0 ]; then
if [ -n "$(command -v timeout)" ]; then
- if timeout --help | grep -qw -- '-k'; then
+ if timeout --help 2>&1 | grep -qw -- '-k'; then
ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
else
ltcmd="timeout -s9 $tmt $tcmd"
|
