opnsense-ports/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh
Franco Fichtner 13a6e9bab9 */*: sync with upstream
Taken from: HardenedBSD
2021-07-05 10:55:42 +02:00

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"