[Pkg-escience-soc2009] [SCM] Tool for creating VM images. branch, master, updated. d307dbb3fc1ce1ed1ef76b590710d1ec6f32cc35

[Steffen Moeller]

The following commit has been merged in the master branch:
commit c33cb83dd34b76b8337448923c32eabcf504f6d9
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Wed Jul 8 18:14:58 2009 +0200

    First obvious round of fixes on vm_deploy_script

diff --git a/VMBuilder/plugins/virtualbox/templates/vm_deploy_script.tmpl b/VMBuilder/plugins/virtualbox/templates/vm_deploy_script.tmpl
index 2d82999..4998280 100644
--- a/VMBuilder/plugins/virtualbox/templates/vm_deploy_script.tmpl
+++ b/VMBuilder/plugins/virtualbox/templates/vm_deploy_script.tmpl
@@ -30,17 +30,16 @@ fi
 
 
 # FIXME: test on identity needs improvement
-if VBoxManage list hdds; egrep '^Location:.*$disk\$'; then
-	echo "Disk '$disk' is already known to the system. Skipping HD creation."
-else
-	VBoxManage openmedium #slurp
 #set $i = 0
 #for $disk in $vm_disks
     #set $i = $i + 1
     #set $disk = os.path.basename(disk)
-disk \${disk_path}/$disk -type normal #slurp
-#end for
+if VBoxManage list hdds; egrep '^Location:.*$disk\$'; then
+	echo "Disk '$disk' is already known to the system. Skipping HD creation."
+else
+	VBoxManage openmedium disk \${disk_path}/$disk -type normal
 fi
+#end for
 
 sata=""
 if ! VBoxManage --version | grep -q "_OSE"; then sata="-sata on"; fi

-- 
Tool for creating VM images.