|
Lines 1-11
Link Here
|
| 1 |
--- scripts/wsrep_sst_mariabackup.sh.orig 2019-12-11 19:29:57 UTC |
1 |
--- scripts/wsrep_sst_mariabackup.sh.orig 2021-06-09 14:23:11.000000000 +0200 |
| 2 |
+++ scripts/wsrep_sst_mariabackup.sh |
2 |
+++ scripts/wsrep_sst_mariabackup.sh |
| 3 |
@@ -605,7 +605,7 @@ recv_joiner() |
3 |
@@ -696,7 +696,7 @@ |
| 4 |
set +e |
4 |
local ltcmd="$tcmd" |
| 5 |
|
5 |
if [ $tmt -gt 0 ]; then |
| 6 |
if [[ $tmt -gt 0 ]] && command -v timeout >/dev/null;then |
6 |
if [ -n "$(command -v timeout)" ]; then |
| 7 |
- if timeout --help | grep -q -- '-k';then |
7 |
- if timeout --help | grep -qw -- '-k'; then |
| 8 |
+ if timeout --help 2>&1 | grep -q -- '-k';then |
8 |
+ if timeout --help 2>&1 | grep -qw -- '-k'; then |
| 9 |
ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd" |
9 |
ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd" |
| 10 |
else |
10 |
else |
| 11 |
ltcmd="timeout -s9 $tmt $tcmd" |
11 |
ltcmd="timeout -s9 $tmt $tcmd" |