Switch back to vagrant as submodule in order to ease debugging

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "vagrant-1.1"]
+[submodule "vagrant"]
-	path = vagrant-1.1
+	path = vagrant
 	url = git://github.com/mitchellh/vagrant.git

Gemfile

@@ -7,7 +7,7 @@ end
 
 gemspec
 
-gem 'vagrant', github: 'mitchellh/vagrant'
+gem 'vagrant', path: './vagrant'
 gem 'rake'
 gem 'net-ssh'
 gem 'rspec'

Gemfile.lock

@@ -1,6 +1,10 @@
-GIT
+PATH
-  remote: git://github.com/mitchellh/vagrant.git
+  remote: .
-  revision: 803269f7291719715011c5c76d66e20101f7af50
+  specs:
+    vagrant-lxc (0.0.1)
+
+PATH
+  remote: ./vagrant
   specs:
     vagrant (1.1.0.dev)
       childprocess (~> 0.3.7)
@@ -11,11 +15,6 @@ GIT
       net-scp (~> 1.0.4)
       net-ssh (~> 2.2.2)
 
-PATH
-  remote: .
-  specs:
-    vagrant-lxc (0.0.1)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -34,7 +33,7 @@ GEM
     guard-rspec (2.4.1)
       guard (>= 1.1)
       rspec (~> 2.11)
-    i18n (0.6.1)
+    i18n (0.6.2)
     json (1.6.8)
     listen (0.7.3)
     log4r (1.1.10)

dev/Gemfile

@@ -5,5 +5,5 @@ end
 
 source "https://rubygems.org"
 
-gem 'vagrant',     github: 'mitchellh/vagrant'
+gem 'vagrant',     path: '../vagrant'
 gem 'vagrant-lxc', path: '../'

dev/Gemfile.lock

@@ -1,6 +1,10 @@
-GIT
+PATH
-  remote: git://github.com/mitchellh/vagrant.git
+  remote: ../
-  revision: 803269f7291719715011c5c76d66e20101f7af50
+  specs:
+    vagrant-lxc (0.0.1)
+
+PATH
+  remote: ../vagrant
   specs:
     vagrant (1.1.0.dev)
       childprocess (~> 0.3.7)
@@ -11,11 +15,6 @@ GIT
       net-scp (~> 1.0.4)
       net-ssh (~> 2.2.2)
 
-PATH
-  remote: ../
-  specs:
-    vagrant-lxc (0.0.1)
-
 GEM
   remote: https://rubygems.org/
   specs:

setup-vagrant-dev-box

@@ -58,6 +58,9 @@ end
 # Cache development dependencies
 `mkdir -p cache`
 
+# Fetches vagrant submodule
+`git submodule update --init`
+
 # Cache container image between vagrant box destructions
 download "#{IMAGE_ROOT}/#{IMAGE_NAME}", IMAGE_NAME
 
@@ -117,9 +120,8 @@ vagrant_ssh 'sudo chown vagrant:vagrant /etc/rinetd.conf'
 vagrant_ssh 'cd /vagrant && bundle && cd /vagrant/dev && bundle'
 
 # Setup vagrant default ssh key
-# FIXME: This is wrong
+vagrant_keys_path = '/vagrant/vagrant/keys'
-vagrant_keys_path = '~/gems/bundler/gems/vagrant-803269f72917/keys'
+vagrant_ssh "mkdir -p ~/.ssh && cd /vagrant && cp #{vagrant_keys_path}/vagrant ~/.ssh/id_rsa && cp #{vagrant_keys_path}/vagrant.pub ~/.ssh/id_rsa.pub && chmod 600 ~/.ssh/id_rsa"
-vagrant_ssh "cd /vagrant && mkdir -p ~/.ssh && cp #{vagrant_keys_path}/vagrant ~/.ssh/id_rsa && cp #{vagrant_keys_path}/vagrant.pub ~/.ssh/id_rsa.pub && chmod 600 ~/.ssh/id_rsa"
 
 # Setup lxc cache
 vagrant_ssh "sudo mkdir -p /var/cache/lxc/cloud-quantal && sudo cp /vagrant/cache/#{IMAGE_NAME} /var/cache/lxc/cloud-quantal/#{IMAGE_NAME}"

vagrant

@@ -0,0 +1 @@
+Subproject commit 68aa9c8acf386cd1926dc432a98ddf21ca4ad0e9