VM: changes for 6.0.3

* loving hostname alternation on hydra once again
* generate ova instead of ovf

remaining issue:  vb guest additions are not dkms'ed on i386

diff --git a/vm/d-i/squeeze/preseed.cfg b/vm/d-i/squeeze/preseed.cfg
index db13fc7bd1959849d0ec58816665382566923d59..62a14b0091f78c289a0f372f443fb90b3a89a931 100644 (file)
--- a/vm/d-i/squeeze/preseed.cfg
+++ b/vm/d-i/squeeze/preseed.cfg
@@ -323,7 +323,7 @@ d-i debian-installer/exit/poweroff boolean true
 # packages and run commands in the target system.
 #d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh
 #d-i preseed/late_command string wget -O/target/tmp/initial_setup http://git.debian.org/?p=pkg-exppsy/neurodebian.git;a=blob_plain;f=vm/d-i/tools/initial_setup;hb=HEAD; \
-d-i preseed/late_command string wget -O/target/tmp/initial_setup http://hydra.dartmouth.edu/d-i/tools/initial_setup ; \
+d-i preseed/late_command string wget -O/target/tmp/initial_setup http://head1.hydra.dartmouth.edu/d-i/tools/initial_setup ; \
         in-target /bin/bash /tmp/initial_setup
 
 # XXX here get/call nd_setupguestos ?

diff --git a/vm/tools/nd_createappliance b/vm/tools/nd_createappliance
index a0335bdbf42c8d37ad6fc3b302bdfdfbde8aa7e2..eb0f152e87875e8580a1472bd73cda7e76f9410d 100755 (executable)
--- a/vm/tools/nd_createappliance
+++ b/vm/tools/nd_createappliance
@@ -8,7 +8,7 @@ set -eu
 #iso=debian-squeeze-di-beta1-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
+di_host=head1.hydra.dartmouth.edu               # where to look for di preseed
 
 build_dir=$PWD/build
 dist_dir=$PWD/dist
@@ -41,7 +41,9 @@ vm_fprefix="${vendor}_${vm_version}_${vm_arch}" # common prefix for files
 #vm_disk="$build_dir/nd-${vm_version}_${vm_arch}.vdi"
 vm_disk="$build_dir/${vm_fprefix}.vdi"
 vm_name="${vendor} ${vm_version} ${vm_arch_name}"
-vm_ovf="${dist_dir}/${vm_fprefix}.ovf"
+# Let's use OVA since 4.x
+# vm_ovf="${dist_dir}/${vm_fprefix}.ovf"
+vm_ova="${dist_dir}/${vm_fprefix}.ova"
 product_name="${vendor} VirtualMachine (${vm_arch})"
 
 _info() {
@@ -157,7 +159,7 @@ sudo ./nd_compactvdi "${vm_disk}"
 
 _info Exporting the appliance
 
-VBoxManage export "${vm_name}" -o "$vm_ovf" \
+VBoxManage export "${vm_name}" -o "$vm_ova" \
        --vsys 0 \
        --product "${product_name}" \
        --producturl "${product_url}" \
@@ -170,7 +172,7 @@ _info Cleaning after ourselves
 clean_buildvm
 
 _info Testing import of the appliance
-VBoxManage import "$vm_ovf" --vsys 0 --eula accept
+VBoxManage import "$vm_ova" --vsys 0 --eula accept
 
 _info Starting imported machine
 VBoxManage startvm "${vm_name}"