From 40e823d90aa4e061c9ed893bf88a5929b39ffb2e Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 12 Apr 2010 14:38:34 -0700
Subject: [PATCH] Shorten shared folders further [see GH-50]

---
 lib/vagrant/actions/vm/boot.rb              | 2 +-
 lib/vagrant/provisioners/chef_solo.rb       | 4 ++--
 test/vagrant/actions/vm/boot_test.rb        | 2 +-
 test/vagrant/provisioners/chef_solo_test.rb | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/vagrant/actions/vm/boot.rb b/lib/vagrant/actions/vm/boot.rb
index 8f7b90459..173ebf455 100644
--- a/lib/vagrant/actions/vm/boot.rb
+++ b/lib/vagrant/actions/vm/boot.rb
@@ -3,7 +3,7 @@ module Vagrant
     module VM
       class Boot < Base
         def prepare
-          @runner.env.config.vm.share_folder("vagrant-root", @runner.env.config.vm.project_directory, @runner.env.root_path)
+          @runner.env.config.vm.share_folder("v-root", @runner.env.config.vm.project_directory, @runner.env.root_path)
         end
 
         def execute!
diff --git a/lib/vagrant/provisioners/chef_solo.rb b/lib/vagrant/provisioners/chef_solo.rb
index 8aba185f8..c6f646a2d 100644
--- a/lib/vagrant/provisioners/chef_solo.rb
+++ b/lib/vagrant/provisioners/chef_solo.rb
@@ -16,13 +16,13 @@ module Vagrant
 
       def share_cookbook_folders
         host_cookbook_paths.each_with_index do |cookbook, i|
-          env.config.vm.share_folder("vagrant-csc-#{i}", cookbook_path(i), cookbook)
+          env.config.vm.share_folder("v-csc-#{i}", cookbook_path(i), cookbook)
         end
       end
 
       def share_role_folders
         host_role_paths.each_with_index do |role, i|
-          env.config.vm.share_folder("vagrant-csr-#{i}", role_path(i), role)
+          env.config.vm.share_folder("v-csr-#{i}", role_path(i), role)
         end
       end
 
diff --git a/test/vagrant/actions/vm/boot_test.rb b/test/vagrant/actions/vm/boot_test.rb
index 402c6f66f..41d3909e5 100644
--- a/test/vagrant/actions/vm/boot_test.rb
+++ b/test/vagrant/actions/vm/boot_test.rb
@@ -8,7 +8,7 @@ class BootActionTest < Test::Unit::TestCase
 
   context "preparing" do
     should "add the root shared folder" do
-      @runner.env.config.vm.expects(:share_folder).with("vagrant-root", @runner.env.config.vm.project_directory, @runner.env.root_path).once
+      @runner.env.config.vm.expects(:share_folder).with("v-root", @runner.env.config.vm.project_directory, @runner.env.root_path).once
       @action.prepare
     end
   end
diff --git a/test/vagrant/provisioners/chef_solo_test.rb b/test/vagrant/provisioners/chef_solo_test.rb
index 2bfb2da14..83b495eb8 100644
--- a/test/vagrant/provisioners/chef_solo_test.rb
+++ b/test/vagrant/provisioners/chef_solo_test.rb
@@ -38,7 +38,7 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
     should "share each cookbook folder" do
       share_seq = sequence("share_seq")
       @host_cookbook_paths.each_with_index do |cookbook, i|
-        @env.config.vm.expects(:share_folder).with("vagrant-csc-#{i}", @action.cookbook_path(i), cookbook).in_sequence(share_seq)
+        @env.config.vm.expects(:share_folder).with("v-csc-#{i}", @action.cookbook_path(i), cookbook).in_sequence(share_seq)
       end
 
       @action.share_cookbook_folders
@@ -54,7 +54,7 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
     should "share each role folder" do
       share_seq = sequence("share_seq")
       @host_role_paths.each_with_index do |role, i|
-        @env.config.vm.expects(:share_folder).with("vagrant-csr-#{i}", @action.role_path(i), role).in_sequence(share_seq)
+        @env.config.vm.expects(:share_folder).with("v-csr-#{i}", @action.role_path(i), role).in_sequence(share_seq)
       end
 
       @action.share_role_folders