Skip to content

Commit

Permalink
wsrep scripts fixes for working on OpenBSD
Browse files Browse the repository at this point in the history
  • Loading branch information
brad0 authored and grooverdan committed Jan 19, 2024
1 parent ee1407f commit 2ef01d0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions scripts/wsrep_sst_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1166,9 +1166,9 @@ is_local_ip()
# the domain name check:
if [ "${2:-0}" -eq 0 ]; then
# We consider all the names of a given host to be local addresses:
[ "$1" = "$(hostname -s)" -o \
"$1" = "$(hostname -f)" -o \
"$1" = "$(hostname -d)" ] && return 0
[ "$1" = "$(hostname -s 2>/dev/null)" -o \
"$1" = "$(hostname -f 2>/dev/null)" -o \
"$1" = "$(hostname -d 2>/dev/null)" ] && return 0
fi
# If the address contains anything other than digits
# and separators, it is not a local address:
Expand Down
6 changes: 3 additions & 3 deletions scripts/wsrep_sst_rsync.sh
Original file line number Diff line number Diff line change
Expand Up @@ -475,9 +475,9 @@ EOF
# Preparing binlog files for transfer:
wsrep_log_info "Preparing binlog files for transfer:"
tar_type=0
if tar --help | grep -qw -F -- '--transform'; then
if tar --help 2>/dev/null | grep -qw -F -- '--transform'; then
tar_type=1
elif tar --version | grep -qw -E '^bsdtar'; then
elif tar --version 2>/dev/null | grep -qw -E '^bsdtar'; then
tar_type=2
fi
if [ $tar_type -eq 2 ]; then
Expand Down Expand Up @@ -980,7 +980,7 @@ EOF
fi
# Extracting binlog files:
wsrep_log_info "Extracting binlog files:"
if tar --version | grep -qw -E '^bsdtar'; then
if tar --version 2>/dev/null | grep -qw -E '^bsdtar'; then
tar -tf "$BINLOG_TAR_FILE" > "$tmpfile" && \
tar -xvf "$BINLOG_TAR_FILE" > /dev/null || RC=$?
else
Expand Down

0 comments on commit 2ef01d0

Please sign in to comment.