From 44f5fa2db932d44dd66a69de965646ff6ecbb56d Mon Sep 17 00:00:00 2001 From: Brad Smith Date: Sat, 30 Dec 2023 16:30:22 -0500 Subject: [PATCH] Fix timeout(1) usage in wsrep_sst_mariabackup on *BSD Also fix the usage of timeout(1) on NetBSD, OpenBSD and DragonFly. --- scripts/wsrep_sst_mariabackup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/wsrep_sst_mariabackup.sh b/scripts/wsrep_sst_mariabackup.sh index 2b05326e500..53172da7b96 100644 --- a/scripts/wsrep_sst_mariabackup.sh +++ b/scripts/wsrep_sst_mariabackup.sh @@ -803,7 +803,8 @@ recv_joiner() if [ $tmt -gt 0 ]; then if [ -n "$(commandex timeout)" ]; then local koption=0 - if [ "$OS" = 'FreeBSD' ]; then + if [ "$OS" = 'FreeBSD' -o "$OS" = 'NetBSD' -o "$OS" = 'OpenBSD' -o \ + "$OS" = 'DragonFly' ]; then if timeout 2>&1 | grep -qw -F -- '-k'; then koption=1 fi