opnsense-ports/databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh
Franco Fichtner cd02f9328e */*: sync with upstream
Taken from: FreeBSD
2022-02-15 15:37:39 +01:00

11 lines
483 B
Bash

--- scripts/wsrep_sst_mariabackup.sh.orig 2022-02-14 08:10:09 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"