summaryrefslogtreecommitdiffstats
path: root/os-plugins
diff options
context:
space:
mode:
authorDirk von Suchodoletz2009-03-20 01:38:52 +0100
committerDirk von Suchodoletz2009-03-20 01:38:52 +0100
commit16d888935a0f9eb566b51093ca326a4fd3067bce (patch)
treeff704edeb0a8320860192459654fe3592d25b69d /os-plugins
parentMoved the loading of aufs/unionfs modules, hoping to fix the id44 (diff)
downloadcore-16d888935a0f9eb566b51093ca326a4fd3067bce.tar.gz
core-16d888935a0f9eb566b51093ca326a4fd3067bce.tar.xz
core-16d888935a0f9eb566b51093ca326a4fd3067bce.zip
Possible fix for #400 issue ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2744 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
-rw-r--r--os-plugins/plugins/vmware/files/run-virt.include6
1 files changed, 4 insertions, 2 deletions
diff --git a/os-plugins/plugins/vmware/files/run-virt.include b/os-plugins/plugins/vmware/files/run-virt.include
index 62a7bc71..72037f5f 100644
--- a/os-plugins/plugins/vmware/files/run-virt.include
+++ b/os-plugins/plugins/vmware/files/run-virt.include
@@ -290,9 +290,11 @@ vmopt="-X"
# check if ide/scsi and hwver of image
# *-flat.vmdk images are started via the vmdk file, so there's no need to
# exclude these flat files, we do it anyway
+# read the first 22 lines otherwise it takes too much time (see #400)
if [ $(echo ${imagename} | grep -cv "\-flat.vmdk") ]; then
- hddrv=$(grep -m1 -ia "ddb.adapterType" ${diskfile} | awk -F '"' '{print $2}')
- hwver=$(grep -m1 -ia "ddb.virtualHWVersion" ${diskfile} | \
+ hddrv=$(head -22 ${diskfile} | grep -m1 -ia "ddb.adapterType" |\
+ awk -F '"' '{print $2}')
+ hwver=$(head -22 ${diskfile} | grep -m1 -ia "ddb.virtualHWVersion" |\
awk -F '"' '{print $2}')
if [ "${hddrv}" = "ide" ]; then
ide="TRUE"