From 59ae16998d5841a77bcdcf5b2ffb5d1929df4d41 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 19 Mar 2010 15:53:24 -0700
Subject: [PATCH] Set the environment on the loaded box

---
 lib/vagrant/box.rb               | 3 +++
 lib/vagrant/environment.rb       | 1 +
 test/vagrant/environment_test.rb | 7 +++++++
 3 files changed, 11 insertions(+)

diff --git a/lib/vagrant/box.rb b/lib/vagrant/box.rb
index bbc63b96d..f50c0f825 100644
--- a/lib/vagrant/box.rb
+++ b/lib/vagrant/box.rb
@@ -51,6 +51,9 @@ module Vagrant
     # only be used internally.
     attr_accessor :temp_path
 
+    # The environment which this box belongs to
+    attr_accessor :env
+
     class <<self
       # Returns an array of all created boxes, as strings.
       #
diff --git a/lib/vagrant/environment.rb b/lib/vagrant/environment.rb
index abe338ba0..01ab5734a 100644
--- a/lib/vagrant/environment.rb
+++ b/lib/vagrant/environment.rb
@@ -155,6 +155,7 @@ module Vagrant
       return unless root_path
 
       @box = Box.find(config.vm.box) if config.vm.box
+      @box.env = self if @box
     end
 
     # Loads the persisted VM (if it exists) for this environment.
diff --git a/test/vagrant/environment_test.rb b/test/vagrant/environment_test.rb
index ac45a450f..cf4337c53 100644
--- a/test/vagrant/environment_test.rb
+++ b/test/vagrant/environment_test.rb
@@ -302,6 +302,7 @@ class EnvironmentTest < Test::Unit::TestCase
     context "loading box" do
       setup do
         @box = mock("box")
+        @box.stubs(:env=)
 
         @env = mock_environment
         @env.stubs(:root_path).returns("foo")
@@ -327,6 +328,12 @@ class EnvironmentTest < Test::Unit::TestCase
         @env.load_box!
         assert @box.equal?(@env.box)
       end
+
+      should "set the environment of the box" do
+        @box.expects(:env=).with(@env).once
+        Vagrant::Box.expects(:find).with(@env.config.vm.box).once.returns(@box)
+        @env.load_box!
+      end
     end
 
     context "loading the UUID out from the persisted dotfile" do