From 9e9362d9760fb5054aec2847bac0fa69205fa88b Mon Sep 17 00:00:00 2001 From: Atha Kouroussis Date: Mon, 8 Dec 2014 09:42:13 -0500 Subject: [PATCH] Fix broken rsync cap for Solaris guests --- plugins/guests/solaris/cap/rsync.rb | 6 +++--- plugins/guests/solaris11/cap/rsync.rb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/guests/solaris/cap/rsync.rb b/plugins/guests/solaris/cap/rsync.rb index d060a8020..0d0220f40 100644 --- a/plugins/guests/solaris/cap/rsync.rb +++ b/plugins/guests/solaris/cap/rsync.rb @@ -17,10 +17,10 @@ module VagrantPlugins end def self.rsync_post(machine, opts) - su_cmd = machine.config.solaris.su_cmd + suexec_cmd = machine.config.solaris.suexec_cmd machine.communicate.execute( - "#{su_cmd} find '#{opts[:guestpath]}' '(' ! -user #{opts[:owner]} -or ! -group #{opts[:group]} ')' -print0 | " + - "xargs -0 -r chown #{opts[:owner]}:#{opts[:group]}") + "#{suexec_cmd} find '#{opts[:guestpath]}' '(' ! -user #{opts[:owner]} -or ! -group #{opts[:group]} ')' -print0 | " + + "xargs -0 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 039602172..95df046c9 100644 --- a/plugins/guests/solaris11/cap/rsync.rb +++ b/plugins/guests/solaris11/cap/rsync.rb @@ -17,10 +17,10 @@ module VagrantPlugins end def self.rsync_post(machine, opts) - su_cmd = machine.config.solaris11.su_cmd + suexec_cmd = machine.config.solaris11.suexec_cmd machine.communicate.execute( - "#{su_cmd} '#{opts[:guestpath]}' '(' ! -user #{opts[:owner]} -or ! -group #{opts[:group]} ')' -print0 | " + - "xargs -0 -r chown #{opts[:owner]}:#{opts[:group]}") + "#{suexec_cmd} '#{opts[:guestpath]}' '(' ! -user #{opts[:owner]} -or ! -group #{opts[:group]} ')' -print0 | " + + "xargs -0 chown #{opts[:owner]}:#{opts[:group]}") end end end