From 1f02318a5e004d2b57574d26dbd988580ef134f2 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 11 Jan 2012 23:23:05 -0800
Subject: [PATCH] Variable name conflict

---
 lib/vagrant/guest/linux.rb   | 6 +++---
 lib/vagrant/guest/solaris.rb | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/vagrant/guest/linux.rb b/lib/vagrant/guest/linux.rb
index 330ceb6d7..a3d23651f 100644
--- a/lib/vagrant/guest/linux.rb
+++ b/lib/vagrant/guest/linux.rb
@@ -56,13 +56,13 @@ module Vagrant
       #-------------------------------------------------------------------
       def mount_folder(name, guestpath, options)
         # Determine the permission string to attach to the mount command
-        options = "-o uid=`id -u #{options[:owner]}`,gid=`id -g #{options[:group]}`"
-        options += ",#{options[:extra]}" if options[:extra]
+        mount_options = "-o uid=`id -u #{options[:owner]}`,gid=`id -g #{options[:group]}`"
+        mount_options += ",#{options[:extra]}" if options[:extra]
 
         attempts = 0
         while 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
           end
 
diff --git a/lib/vagrant/guest/solaris.rb b/lib/vagrant/guest/solaris.rb
index 8976e7bbd..e5543967c 100644
--- a/lib/vagrant/guest/solaris.rb
+++ b/lib/vagrant/guest/solaris.rb
@@ -99,9 +99,9 @@ module Vagrant
         vm.channel.execute("#{vm.config.solaris.suexec_cmd} mkdir -p #{guestpath}")
 
         # Mount the folder with the proper owner/group
-        options = "-o uid=`id -u #{owner}`,gid=`id -g #{group}`"
-        options += ",#{options[:extra]}" if options[:extra]
-        vm.channel.execute("#{vm.config.solaris.suexec_cmd} /sbin/mount -F vboxfs #{options} #{name} #{guestpath}")
+        mount_options = "-o uid=`id -u #{owner}`,gid=`id -g #{group}`"
+        mount_options += ",#{options[:extra]}" if options[:extra]
+        vm.channel.execute("#{vm.config.solaris.suexec_cmd} /sbin/mount -F vboxfs #{mount_options} #{name} #{guestpath}")
 
         # chown the folder to the proper owner/group
         vm.channel.execute("#{vm.config.solaris.suexec_cmd} chown `id -u #{owner}`:`id -g #{group}` #{guestpath}")