Merge remote-tracking branch 'hydra/master'

* hydra/master:
  just a comment on TODO for adding PyMVPA into the vmsetupwizard selection
  move previous builds of ova aside

diff --git a/tools/nd-vmsetupwizard b/tools/nd-vmsetupwizard
index ed3c7a4b690e72717d0641e7994d1ccb76ced9dd..8d69df4b38c3da75afb345ade40b7363371c9428 100755 (executable)
--- a/tools/nd-vmsetupwizard
+++ b/tools/nd-vmsetupwizard
@@ -104,6 +104,9 @@ fi
 # create symlink to shared folder into homedir
 [ ! -e $HOME/host ] && ln -s /media/sf_host $HOME/host
 
+# TODO: add PyMVPA:
+#   FALSE "PyMVPA" "python-mvpa2,python-mvpa2-doc,python-mvpa2-tutorial-data" \
+# needs -doc and -tutorial-data package
 packages=$(zenity --list $icon_opt --checklist --column="Install" --column="Description" \
           --column="Package Name" --print-column=3 --hide-column=3 --hide-header \
           --separator=' ' --text="Please select any additional component that shall be installed.

diff --git a/vm/tools/nd_createappliance b/vm/tools/nd_createappliance
index b92a832382f7e06757aff3754f7d7690482dfe85..6a4539bb962f96136efc042e0730ac1e5f27de07 100755 (executable)
--- a/vm/tools/nd_createappliance
+++ b/vm/tools/nd_createappliance
@@ -158,7 +158,11 @@ _info Compacting VDI
 sudo ./nd_compactvdi "${vm_disk}"
 
 _info Exporting the appliance
-
+if [ -e "$vm_ova" ]; then
+    vm_ova_old=$vm_ova.`date +"20%y%m%d%H%M"`
+    _info Previous OVA image exists, renaming it to $vm_ova_old
+    mv "$vm_ova" "$vm_ova_old"
+fi
 VBoxManage export "${vm_name}" -o "$vm_ova" \
        --vsys 0 \
        --product "${product_name}" \