Commit 72092878 authored by Julien Del-Piccolo's avatar Julien Del-Piccolo Committed by Sergey Vojtovich

Fix bash expansion issue in wsrep_sst_rsync (#443)

* Fix bash expansion issue in wsrep_sst_rsync. https://github.com/docker-library/mariadb/issues/126

* Fix permissions
parent 1136c8d3
...@@ -357,18 +357,18 @@ EOF ...@@ -357,18 +357,18 @@ EOF
readonly RSYNC_PORT=${WSREP_SST_OPT_PORT:-4444} readonly RSYNC_PORT=${WSREP_SST_OPT_PORT:-4444}
# If the IP is local listen only in it # If the IP is local listen only in it
if is_local_ip $RSYNC_ADDR if is_local_ip "$RSYNC_ADDR"
then then
rsync --daemon --no-detach --address $RSYNC_ADDR --port $RSYNC_PORT --config "$RSYNC_CONF" & rsync --daemon --no-detach --address "$RSYNC_ADDR" --port "$RSYNC_PORT" --config "$RSYNC_CONF" &
else else
# Not local, possibly a NAT, listen in all interface # Not local, possibly a NAT, listen in all interface
rsync --daemon --no-detach --port $RSYNC_PORT --config "$RSYNC_CONF" & rsync --daemon --no-detach --port "$RSYNC_PORT" --config "$RSYNC_CONF" &
# Overwrite address with all # Overwrite address with all
RSYNC_ADDR="*" RSYNC_ADDR="*"
fi fi
RSYNC_REAL_PID=$! RSYNC_REAL_PID=$!
until check_pid_and_port $RSYNC_PID $RSYNC_REAL_PID $RSYNC_ADDR $RSYNC_PORT until check_pid_and_port "$RSYNC_PID" "$RSYNC_REAL_PID" "$RSYNC_ADDR" "$RSYNC_PORT"
do do
sleep 0.2 sleep 0.2
done done
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment