haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Variable name conflict

This commit is contained in:
Mitchell Hashimoto 2012-01-11 23:23:05 -08:00
parent 7ddee76c00
commit 1f02318a5e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/vagrant/guest/linux.rb
View File

@ -56,13 +56,13 @@ module Vagrant
#------------------------------------------------------------------- #-------------------------------------------------------------------
def mount_folder(name, guestpath, options) def mount_folder(name, guestpath, options)
# Determine the permission string to attach to the mount command # Determine the permission string to attach to the mount command
options = "-o uid=`id -u #{options[:owner]}`,gid=`id -g #{options[:group]}`" mount_options = "-o uid=`id -u #{options[:owner]}`,gid=`id -g #{options[:group]}`"
options += ",#{options[:extra]}" if options[:extra] mount_options += ",#{options[:extra]}" if options[:extra]
attempts = 0 attempts = 0
while true while true
success = true success = true
@vm.channel.sudo("mount -t vboxsf #{options} #{name} #{guestpath}") do |type, data| @vm.channel.sudo("mount -t vboxsf #{mount_options} #{name} #{guestpath}") do |type, data|
success = false if type == :stderr && data =~ /No such device/i success = false if type == :stderr && data =~ /No such device/i
end end

6
lib/vagrant/guest/solaris.rb
View File

@ -99,9 +99,9 @@ module Vagrant
vm.channel.execute("#{vm.config.solaris.suexec_cmd} mkdir -p #{guestpath}") vm.channel.execute("#{vm.config.solaris.suexec_cmd} mkdir -p #{guestpath}")
# Mount the folder with the proper owner/group # Mount the folder with the proper owner/group
options = "-o uid=`id -u #{owner}`,gid=`id -g #{group}`" mount_options = "-o uid=`id -u #{owner}`,gid=`id -g #{group}`"
options += ",#{options[:extra]}" if options[:extra] mount_options += ",#{options[:extra]}" if options[:extra]
vm.channel.execute("#{vm.config.solaris.suexec_cmd} /sbin/mount -F vboxfs #{options} #{name} #{guestpath}") vm.channel.execute("#{vm.config.solaris.suexec_cmd} /sbin/mount -F vboxfs #{mount_options} #{name} #{guestpath}")
# chown the folder to the proper owner/group # chown the folder to the proper owner/group
vm.channel.execute("#{vm.config.solaris.suexec_cmd} chown `id -u #{owner}`:`id -g #{group}` #{guestpath}") vm.channel.execute("#{vm.config.solaris.suexec_cmd} chown `id -u #{owner}`:`id -g #{group}` #{guestpath}")