diff options
| author | Julien Del-Piccolo <jdel@users.noreply.github.com> | 2017-09-03 09:33:27 +0200 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2017-09-03 11:33:27 +0400 |
| commit | 720928782faee2f5ca576a2a3bc2bead001c6369 (patch) | |
| tree | f0882153c517dfa9d38096e0d352e093bcbb2593 /scripts/wsrep_sst_rsync.sh | |
| parent | 1136c8d366a6ad7b8d487194fb01c0a5bb072220 (diff) | |
| download | mariadb-git-720928782faee2f5ca576a2a3bc2bead001c6369.tar.gz | |
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
Diffstat (limited to 'scripts/wsrep_sst_rsync.sh')
| -rw-r--r-- | scripts/wsrep_sst_rsync.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/wsrep_sst_rsync.sh b/scripts/wsrep_sst_rsync.sh index 23ee3df5d40..7acdf87b660 100644 --- a/scripts/wsrep_sst_rsync.sh +++ b/scripts/wsrep_sst_rsync.sh @@ -357,18 +357,18 @@ EOF readonly RSYNC_PORT=${WSREP_SST_OPT_PORT:-4444} # If the IP is local listen only in it - if is_local_ip $RSYNC_ADDR + if is_local_ip "$RSYNC_ADDR" 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 # 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 RSYNC_ADDR="*" fi 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 sleep 0.2 done |