Merge branch 'master' of github.com:leapcode/leap-vagrant

Conflicts:
	definitions/wheezy/cleanup-virtualbox.sh
	definitions/wheezy/definition.rb

1 files changed, 24 insertions, 4 deletions

diff --git a/definitions/wheezy/virtualbox.sh b/definitions/wheezy/virtualbox.sh
index 5a91aa6..818ca30 100644
--- a/definitions/wheezy/virtualbox.sh
+++ b/definitions/wheezy/virtualbox.sh
@@ -1,15 +1,35 @@
 if test -f .vbox_version ; then
   # The netboot installs the VirtualBox support (old) so we have to remove it
-  /etc/init.d/virtualbox-ose-guest-utils stop
+  if test -f /etc/init.d/virtualbox-ose-guest-utils ; then
+    /etc/init.d/virtualbox-ose-guest-utils stop
+  fi
+
   rmmod vboxguest
   aptitude -y purge virtualbox-ose-guest-x11 virtualbox-ose-guest-dkms virtualbox-ose-guest-utils
 
+  # Install dkms for dynamic compiles
+
+  apt-get install -y dkms
+  
+  # If libdbus is not installed, virtualbox will not autostart
+  apt-get -y install --no-install-recommends libdbus-1-3
+
   # Install the VirtualBox guest additions
-  VBOX_VERSION=$(cat /home/vagrant/.vbox_version)
-  cd /tmp
-  wget http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso 
+  VBOX_VERSION=$(cat .vbox_version)
   VBOX_ISO=VBoxGuestAdditions_$VBOX_VERSION.iso
   mount -o loop $VBOX_ISO /mnt
   yes|sh /mnt/VBoxLinuxAdditions.run
   umount /mnt
+
+  # Start the newly build driver
+  /etc/init.d/vboxadd start
+
+  # Make a temporary mount point
+  mkdir /tmp/veewee-validation
+
+  # Test mount the veewee-validation
+  mount -t vboxsf veewee-validation /tmp/veewee-validation
+
+  rm $VBOX_ISO
+
 fi