Merge branch 'utsname-hostname' of github.com:fpletz/vagrant-lxc

README.md

@@ -13,6 +13,13 @@ to see it in action.
 latest stable version of the plugin, please check the [0.8-stable](https://github.com/fgrehm/vagrant-lxc/tree/0.8-stable)
 branch.
 
+## Usage with Vagrant 1.5
+
+Usage with the recently released Vagrant 1.5 is only possible by [building the
+plugin from sources](https://github.com/fgrehm/vagrant-lxc/wiki/Development#wiki-installing-the-plugin-from-source).
+The 1.0.0.beta1 version of the plugin that will ship with the changes required
+is expected to be released by the end of March 2014.
+
 
 ## Features
 

lib/vagrant-lxc/action.rb

@@ -218,7 +218,7 @@ module Vagrant
                 next
               end
 
-              b3.use BuiltIn::SSHExec
+              b3.use Builtin::SSHExec
             end
           end
         end

lib/vagrant-lxc/action/boot.rb

@@ -11,7 +11,8 @@ module Vagrant
 
           config = env[:machine].provider_config
 
-          config.customize 'utsname', env[:machine].id
+          config.customize 'utsname',
+            env[:machine].config.vm.hostname || env[:machine].id
 
           env[:ui].info I18n.t("vagrant_lxc.messages.starting")
           env[:machine].provider.driver.start(config.customizations)