diff --git a/CHANGELOG.md b/CHANGELOG.md index 8880478e9..53565b085 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,8 +40,6 @@ IMPROVEMENTS: - synced\_folders/nfs: Won't use `sudo` to write to /etc/exports if there are write privileges. [GH-2643] - synced\_folders/smb: Credentials from one SMB will be copied to the rest. [GH-4675] - - synced\_folders/rsync: Added rsync__showoutput option to echo rsync output - to console [GH-4201] BUG FIXES: diff --git a/plugins/synced_folders/rsync/helper.rb b/plugins/synced_folders/rsync/helper.rb index a0a8598e6..37a8a1ddd 100644 --- a/plugins/synced_folders/rsync/helper.rb +++ b/plugins/synced_folders/rsync/helper.rb @@ -121,7 +121,7 @@ module VagrantPlugins machine.ui.info(I18n.t( "vagrant.rsync_folder_excludes", excludes: excludes.inspect)) end - if opts.include?(:showoutput) + if opts.include?(:verbose) machine.ui.info(I18n.t("vagrant.rsync_showing_output")); end @@ -130,7 +130,7 @@ module VagrantPlugins machine.guest.capability(:rsync_pre, opts) end - if opts.include?(:showoutput) + if opts.include?(:verbose) command_opts[:notify] = [ :stdout, :stderr ]; r = Vagrant::Util::Subprocess.execute(*(command + [command_opts])) { |io_name,data| data.each_line { |line| machine.ui.info("rsync[#{io_name}] -> #{line}") } diff --git a/website/docs/source/v2/synced-folders/rsync.html.md b/website/docs/source/v2/synced-folders/rsync.html.md index d92c6d46c..3e97be86d 100644 --- a/website/docs/source/v2/synced-folders/rsync.html.md +++ b/website/docs/source/v2/synced-folders/rsync.html.md @@ -62,7 +62,7 @@ The rsync synced folder type accepts the following options: pattern. By default, the ".vagrant/" directory is excluded. We recommend excluding revision control directories such as ".git/" as well. -* `rsync__showoutput` (boolean) - If true, then the output from the rsync +* `rsync__verbose` (boolean) - If true, then the output from the rsync process will be echoed to the console. The output of rsync is subject to rsync__args of course. By default, this is false.