From: Yaroslav Halchenko <debian@onerussian.com>
Date: Sun, 12 Jun 2011 02:51:40 +0000 (-0400)
Subject: prepare VM images for VB 4.x series using squeeze-backports
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fe0289c70a399df1a2375871a2c55aa775035d7a;p=neurodebian.git

prepare VM images for VB 4.x series using squeeze-backports
---

diff --git a/vm/d-i/tools/initial_setup b/vm/d-i/tools/initial_setup
index c0466e4..e66cfd9 100755
--- a/vm/d-i/tools/initial_setup
+++ b/vm/d-i/tools/initial_setup
@@ -68,7 +68,10 @@ apt-get update -y
 
 # to cheat the VM check
 touch /dev/vboxguest
-# to get all the stuff in recommends
+# Forcefully install guest additions from backports so we are
+# compatible with VirtualBox 4.x series
+apt-get install -y -t squeeze-backports virtualbox-ose-guest-dkms
+# to get all the rest stuff in recommends
 apt-get install -y dkms neurodebian-guest-additions
 
 apt-get install --no-install-recommends -y \
diff --git a/vm/tools/nd_compactvdi b/vm/tools/nd_compactvdi
index 143db91..3d1634d 100755
--- a/vm/tools/nd_compactvdi
+++ b/vm/tools/nd_compactvdi
@@ -60,4 +60,5 @@ umount vbdev
 sudo -u "$SUDO_USER" VBoxManage modifyhd "$vdifile" --compact
 
 # cleanup
+echo "I: Cleaning up after VDI compact operation"
 rm -rf $wdir
diff --git a/vm/tools/nd_createappliance b/vm/tools/nd_createappliance
index 2c794cb..a0335bd 100755
--- a/vm/tools/nd_createappliance
+++ b/vm/tools/nd_createappliance
@@ -6,14 +6,14 @@ set -eu
 
 # TODO: arguments later on to become cmdline args
 #iso=debian-squeeze-di-beta1-amd64-businesscard.iso
-iso=debian-6.0.0-${ARCH:=amd64}-businesscard.iso
+iso=debian-6.0.1a-${ARCH:=amd64}-businesscard.iso
 di_cd=$(readlink -f $PWD/../../../neurodebian-images/$iso)
 di_host=hydra.dartmouth.edu               # where to look for di preseed
 
 build_dir=$PWD/build
 dist_dir=$PWD/dist
 vendor="NeuroDebian"
-vm_version="6.0.2"
+vm_version="6.0.3"
 vm_ostype=Debian
 vendor_url="http://neuro.debian.net"
 product_url="${vendor_url}/vm.html"