Merge pull request #4898 from athak/patch-solaris-rsync

rsynced folders don't work with Solaris based OS
This commit is contained in:
Seth Vargo 2014-12-18 10:30:13 -05:00
commit 5efb30653e
2 changed files with 6 additions and 6 deletions

View File

@ -17,10 +17,10 @@ module VagrantPlugins
end end
def self.rsync_post(machine, opts) def self.rsync_post(machine, opts)
su_cmd = machine.config.solaris.su_cmd suexec_cmd = machine.config.solaris.suexec_cmd
machine.communicate.execute( machine.communicate.execute(
"#{su_cmd} find '#{opts[:guestpath]}' '(' ! -user #{opts[:owner]} -or ! -group #{opts[:group]} ')' -print0 | " + "#{suexec_cmd} find '#{opts[:guestpath]}' '(' ! -user #{opts[:owner]} -or ! -group #{opts[:group]} ')' -print0 | " +
"xargs -0 -r chown #{opts[:owner]}:#{opts[:group]}") "xargs -0 chown #{opts[:owner]}:#{opts[:group]}")
end end
end end
end end

View File

@ -17,10 +17,10 @@ module VagrantPlugins
end end
def self.rsync_post(machine, opts) def self.rsync_post(machine, opts)
su_cmd = machine.config.solaris11.su_cmd suexec_cmd = machine.config.solaris11.suexec_cmd
machine.communicate.execute( machine.communicate.execute(
"#{su_cmd} '#{opts[:guestpath]}' '(' ! -user #{opts[:owner]} -or ! -group #{opts[:group]} ')' -print0 | " + "#{suexec_cmd} '#{opts[:guestpath]}' '(' ! -user #{opts[:owner]} -or ! -group #{opts[:group]} ')' -print0 | " +
"xargs -0 -r chown #{opts[:owner]}:#{opts[:group]}") "xargs -0 chown #{opts[:owner]}:#{opts[:group]}")
end end
end end
end end