ports/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh
Bernard Spil 94df86eca5 databases/mariadb104-server: Security update to 10.4.24
PR:		261969
Security:	ff5606f7-8a45-11ec-8be6-d4c9ef517024
MFH:		2022Q1
2022-02-17 14:09:54 +00:00

11 lines
483 B
Bash

--- scripts/wsrep_sst_mariabackup.sh.orig 2022-02-17 10:18:49 UTC
+++ scripts/wsrep_sst_mariabackup.sh
@@ -715,7 +715,7 @@ recv_joiner()
local ltcmd="$tcmd"
if [ $tmt -gt 0 ]; then
if [ -n "$(commandex 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"