ports/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh
Bernard Spil be54a31d4a databases/mariadb104-server: Security update to 10.4.25
Security:	04fecc47-dad2-11ec-8fbd-d4c9ef517024
MFH:		2022Q2
2022-05-24 15:42:48 +00:00

11 lines
489 B
Bash

--- scripts/wsrep_sst_mariabackup.sh.orig 2022-05-24 12:49:43 UTC
+++ scripts/wsrep_sst_mariabackup.sh
@@ -725,7 +725,7 @@ recv_joiner()
local ltcmd="$tcmd"
if [ $tmt -gt 0 ]; then
if [ -n "$(commandex timeout)" ]; then
- if timeout --help | grep -qw -F -- '-k'; then
+ if timeout --help 2>&1 | grep -qw -F -- '-k'; then
ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
else
ltcmd="timeout -s9 $tmt $tcmd"