environment.rb in vagrant-0.6.5

- old
+ new

@@ -156,11 +156,11 @@
     # @return [Bool]
     def multivm?
       if parent
         parent.multivm?
       else
-        vms.length > 1
+        vms.length > 1 || vms.keys.first != DEFAULT_VM
       end
     end
 
     # Makes a call to the CLI with the given arguments as if they
     # came from the real command line (sometimes they do!). An example:
@@ -304,17 +304,17 @@
       loader.queue << File.join(home_path, ROOTFILE_NAME) if !first_run && home_path
       loader.queue << File.join(root_path, ROOTFILE_NAME) if root_path
 
       # If this environment is representing a sub-VM, then we push that
       # proc on as the last configuration.
-      if !first_run && vm
+      if vm
         subvm = parent.config.vm.defined_vms[vm.name]
         loader.queue << subvm.proc_stack if subvm
       end
 
       # Execute the configuration stack and store the result as the final
       # value in the config ivar.
-      @config = loader.load!
+      @config = loader.load!(!first_run)
 
       # (re)load the logger
       @logger = nil
 
       if first_run