mirror of
https://git.freebsd.org/ports.git
synced 2025-06-09 23:00:30 -04:00
7360433f9f
- Fix table compression [1] - Fix GNUism [2] PR: 239732 [1], 240692 [2] Submitted by: Mike Andrews <mandrews bit0 com> [3] Reported by: Tao Zhou <zhoutao laocius org> [1]
11 lines
437 B
Bash
11 lines
437 B
Bash
--- 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"
|