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

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

3 files changed, 30 insertions, 7 deletions

diff --git a/definitions/wheezy/definition.rb b/definitions/wheezy/definition.rb
index e4264fb..b016565 100644
--- a/definitions/wheezy/definition.rb
+++ b/definitions/wheezy/definition.rb
@@ -3,7 +3,7 @@ Veewee::Definition.declare({
   :memory_size=> '256',
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'on',
   :os_type_id => 'Debian_64',
-  :iso_file => "debian-7.0.0-amd64-netinst.iso",
+  :iso_file => "debian-7.4.0-amd64-netinst.iso",
   :iso_src => "http://cdimage.debian.org/cdimage/release/current/amd64/iso-cd/debian-7.4.0-amd64-netinst.iso",
   :iso_md5 => "e7e9433973f082a297793c3c5010b2c5",
   :iso_download_timeout => "1000",
@@ -37,7 +37,6 @@ Veewee::Definition.declare({
     "base.sh",
     "vagrant.sh",
     "virtualbox.sh",
-    "cleanup-virtualbox.sh",
     "cleanup.sh",
     "zerodisk.sh"
   ],
diff --git a/definitions/wheezy/preseed.cfg b/definitions/wheezy/preseed.cfg
index 969b00d..0738c80 100644
--- a/definitions/wheezy/preseed.cfg
+++ b/definitions/wheezy/preseed.cfg
@@ -96,7 +96,11 @@ d-i clock-setup/ntp boolean true
 # be given in traditional non-devfs format.
 # Note: A disk must be specified, unless the system has only one disk.
 # For example, to use the first SCSI/SATA hard disk:
-d-i partman-auto/disk string /dev/sda
+
+# because with kvm/libvirt, this would end up being /dev/vda
+# d-i partman-auto/disk string /dev/sda
+#d-i partman-auto/disk string /dev/vda
+
 # In addition, you'll need to specify the method to use.
 # The presently available methods are: "regular", "lvm" and "crypto"
 d-i partman-auto/method string lvm
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