From 67af77bed23d23f98b3ab4fab932415c1a44f89d Mon Sep 17 00:00:00 2001
From: kwadronaut <kwadronaut@leap.se>
Date: Sun, 16 Mar 2014 23:44:15 +0100
Subject: seperate virtualbox cleaning into virtualbox.sh, otherwise we have
 troubles with other providers

---
 wheezy/cleanup-virtualbox.sh |  4 ----
 wheezy/virtualbox.sh         | 29 ++++++++++++++++++++++++++---
 2 files changed, 26 insertions(+), 7 deletions(-)
 delete mode 100644 wheezy/cleanup-virtualbox.sh

diff --git a/wheezy/cleanup-virtualbox.sh b/wheezy/cleanup-virtualbox.sh
deleted file mode 100644
index ccc6d5a..0000000
--- a/wheezy/cleanup-virtualbox.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-# Cleanup Virtualbox
-VBOX_VERSION=$(cat .vbox_version)
-VBOX_ISO=VBoxGuestAdditions_$VBOX_VERSION.iso
-rm $VBOX_ISO
diff --git a/wheezy/virtualbox.sh b/wheezy/virtualbox.sh
index 5a91aa6..6c8ef68 100644
--- a/wheezy/virtualbox.sh
+++ b/wheezy/virtualbox.sh
@@ -1,15 +1,38 @@
 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)
+  VBOX_VERSION=$(cat .vbox_version)
+  VBOX_ISO=VBoxGuestAdditions_$VBOX_VERSION.iso
   cd /tmp
   wget http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso 
-  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 /tmp/$VBOX_ISO
+
 fi
-- 
cgit v1.2.3