summaryrefslogtreecommitdiffstats
path: root/os-plugins/plugins/virtualbox/files/run-virt.include
diff options
context:
space:
mode:
authorMichael Janczyk2010-03-23 21:23:55 +0100
committerMichael Janczyk2010-03-23 21:23:55 +0100
commit67a9870012a281c5489e482c69201e8364dec5be (patch)
tree76e3a6dd29dacc21301bc028e997d44a3a29ac87 /os-plugins/plugins/virtualbox/files/run-virt.include
parentqemukvm weiter, sollte laufen (ungetestet), noch anpassungen an scripten notw... (diff)
downloadcore-67a9870012a281c5489e482c69201e8364dec5be.tar.gz
core-67a9870012a281c5489e482c69201e8364dec5be.tar.xz
core-67a9870012a281c5489e482c69201e8364dec5be.zip
qemukvm further modifications, first xen runscripts
Diffstat (limited to 'os-plugins/plugins/virtualbox/files/run-virt.include')
-rw-r--r--os-plugins/plugins/virtualbox/files/run-virt.include9
1 files changed, 5 insertions, 4 deletions
diff --git a/os-plugins/plugins/virtualbox/files/run-virt.include b/os-plugins/plugins/virtualbox/files/run-virt.include
index eb1cb0e9..27289b41 100644
--- a/os-plugins/plugins/virtualbox/files/run-virt.include
+++ b/os-plugins/plugins/virtualbox/files/run-virt.include
@@ -12,7 +12,7 @@
# General information about OpenSLX can be found at http://openslx.org
# -----------------------------------------------------------------------------
# run-virt.include
-# - Include script for running the Virtual Box on an OpenSLX client via the
+# - Include script for running the VirtualBox on an OpenSLX client via the
# run-virt.sh or run-vmgrid.sh
################################################################################
@@ -52,10 +52,10 @@ mkdir -p ${diskfolder} ${snapshotdir} 2>/dev/null
ln -sf ${vmpath} ${diskfile}
# check the file type
-if echo ${imgname} | grep -iE "vdi" >/dev/null 2>&1; then #vmdk|vhd
- imgtype=$(echo ${imgname#*.} | tr [a-z] [A-Z])
+if echo ${imgname} | grep -iE "vdi|vmdk|vhd" >/dev/null 2>&1; then
+ imgtype=$(echo ${imgname##*.} | tr [a-z] [A-Z])
else
- writelog "${imgname} is not a valid image type (vdi), exiting!" #vmdk|vhd
+ writelog "${imgname} is not a valid image type (vdi|vmdk|vhd), exiting!"
exit 1
fi
@@ -99,6 +99,7 @@ diskuuid=$(VBoxManage -q showvdiinfo ${diskfile} | grep UUID | \
# snapshot UUID is static
snapshotuuid="88bc8b6d-f248-468a-95fe-318084904f8b"
+# TODO: MEM muss noch angepasst werden. Maschine crasht wenn nehr als 50% MEM
# memory part equal to vmware plugin
# percentage of memory to use for virtualbox in standard case
if [ -n "${forcemem}" ]; then