mirror of
https://git.freebsd.org/ports.git
synced 2025-04-30 02:26:38 -04:00
8d286ea381
PR: 256827 [1], 256618 [2] Reported by: <vincent jancso outlook com> [1], Robert Clausecker <fuz fuz su> [2]
11 lines
482 B
Bash
11 lines
482 B
Bash
--- scripts/wsrep_sst_mariabackup.sh.orig 2021-06-09 14:23:11.000000000 +0200
|
|
+++ scripts/wsrep_sst_mariabackup.sh
|
|
@@ -696,7 +696,7 @@
|
|
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"
|