diff --git a/CHANGELOG.md b/CHANGELOG.md index 84f4975ac..8cebafb55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,6 @@ BUG FIXES: bad locks. [GH-3735] - commands/package: Don't double included files in package. [GH-3637] - guests/linux: Rsync chown ignores symlinks. [GH-3744] - - guests/openbsd: Remove '-v' flag from chown for rsync. [GH-3743] - provisioners/shell: Fix shell provisioner config validation when the `binary` option is set to false [GH-3712] - providers/docker: default proxy VM won't use HGFS [GH-3687] @@ -31,6 +30,7 @@ BUG FIXES: - providers/docker: Port settings expose to host properly. [GH-3723] - provisioners/puppet: Separate module paths with ';' on Windows. [GH-3731] - synced\_folders\rsync: Copy symlinks as real files. [GH-3734] + - synced\_folders\rsync: Remove non-portable '-v' flag from chown. [GH-3743] ## 1.6.1 (May 7, 2014) diff --git a/plugins/guests/darwin/cap/rsync.rb b/plugins/guests/darwin/cap/rsync.rb index d4b53213a..1ed22a9c9 100644 --- a/plugins/guests/darwin/cap/rsync.rb +++ b/plugins/guests/darwin/cap/rsync.rb @@ -19,7 +19,7 @@ module VagrantPlugins def self.rsync_post(machine, opts) machine.communicate.sudo( "find '#{opts[:guestpath]}' '(' ! -user #{opts[:owner]} -or ! -group #{opts[:group]} ')' -print0 | " + - "xargs -0 -r chown -v #{opts[:owner]}:#{opts[:group]}") + "xargs -0 -r chown #{opts[:owner]}:#{opts[:group]}") end end end diff --git a/plugins/guests/freebsd/cap/rsync.rb b/plugins/guests/freebsd/cap/rsync.rb index a718fab87..df884737f 100644 --- a/plugins/guests/freebsd/cap/rsync.rb +++ b/plugins/guests/freebsd/cap/rsync.rb @@ -25,7 +25,7 @@ module VagrantPlugins def self.rsync_post(machine, opts) machine.communicate.sudo( "find '#{opts[:guestpath]}' '(' ! -user #{opts[:owner]} -or ! -group #{opts[:group]} ')' -print0 | " + - "xargs -0 -r chown -v #{opts[:owner]}:#{opts[:group]}") + "xargs -0 -r chown #{opts[:owner]}:#{opts[:group]}") end end end diff --git a/plugins/guests/netbsd/cap/rsync.rb b/plugins/guests/netbsd/cap/rsync.rb index 0aa2e20ee..5e40a2742 100644 --- a/plugins/guests/netbsd/cap/rsync.rb +++ b/plugins/guests/netbsd/cap/rsync.rb @@ -26,7 +26,7 @@ module VagrantPlugins def self.rsync_post(machine, opts) machine.communicate.sudo( "find '#{opts[:guestpath]}' '(' ! -user #{opts[:owner]} -or ! -group #{opts[:group]} ')' -print0 | " + - "xargs -0 -r chown -v #{opts[:owner]}:#{opts[:group]}") + "xargs -0 -r chown #{opts[:owner]}:#{opts[:group]}") end end end diff --git a/plugins/guests/smartos/cap/rsync.rb b/plugins/guests/smartos/cap/rsync.rb index 5f5100213..2d514cd83 100644 --- a/plugins/guests/smartos/cap/rsync.rb +++ b/plugins/guests/smartos/cap/rsync.rb @@ -18,7 +18,7 @@ module VagrantPlugins def self.rsync_post(machine, opts) machine.communicate.sudo("find '#{opts[:guestpath]}' '(' ! -user #{opts[:owner]} -or ! -group #{opts[:group]} ')' -print0 | " + - "xargs -0 -r chown -v #{opts[:owner]}:#{opts[:group]}") + "xargs -0 -r chown #{opts[:owner]}:#{opts[:group]}") end end end diff --git a/plugins/guests/solaris/cap/rsync.rb b/plugins/guests/solaris/cap/rsync.rb index dab779c98..d060a8020 100644 --- a/plugins/guests/solaris/cap/rsync.rb +++ b/plugins/guests/solaris/cap/rsync.rb @@ -20,7 +20,7 @@ module VagrantPlugins su_cmd = machine.config.solaris.su_cmd machine.communicate.execute( "#{su_cmd} find '#{opts[:guestpath]}' '(' ! -user #{opts[:owner]} -or ! -group #{opts[:group]} ')' -print0 | " + - "xargs -0 -r chown -v #{opts[:owner]}:#{opts[:group]}") + "xargs -0 -r chown #{opts[:owner]}:#{opts[:group]}") end end end diff --git a/plugins/guests/solaris11/cap/rsync.rb b/plugins/guests/solaris11/cap/rsync.rb index 8ec9d3249..039602172 100644 --- a/plugins/guests/solaris11/cap/rsync.rb +++ b/plugins/guests/solaris11/cap/rsync.rb @@ -20,7 +20,7 @@ module VagrantPlugins su_cmd = machine.config.solaris11.su_cmd machine.communicate.execute( "#{su_cmd} '#{opts[:guestpath]}' '(' ! -user #{opts[:owner]} -or ! -group #{opts[:group]} ')' -print0 | " + - "xargs -0 -r chown -v #{opts[:owner]}:#{opts[:group]}") + "xargs -0 -r chown #{opts[:owner]}:#{opts[:group]}") end end end