diff options
| author | Dirk von Suchodoletz | 2010-03-05 01:56:33 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2010-03-05 01:56:33 +0100 |
| commit | f5373bbb19fa8e5133e17720597b472e5bab5920 (patch) | |
| tree | 15ffb2040b38651a8212b49b5b241291031bf4c0 | |
| parent | Changed plugin path ... (diff) | |
| download | core-f5373bbb19fa8e5133e17720597b472e5bab5920.tar.gz core-f5373bbb19fa8e5133e17720597b472e5bab5920.tar.xz core-f5373bbb19fa8e5133e17720597b472e5bab5920.zip | |
Small changes to vmware plugin ...
| -rw-r--r-- | os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm | 6 | ||||
| -rw-r--r-- | os-plugins/plugins/vmware/files/run-virt.include | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm index ba1800ee..4ebaa2b6 100644 --- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm +++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm @@ -414,9 +414,9 @@ sub _writeRunlevelScript if ($kind eq 'local30' || $kind eq 'vmpl3.0') { $script .= unshiftHereDoc(<<" End-of-Here"); # VMplayer 3.0 specific stuff - insmod ${modpath}/vsock.ko || return 1 - insmod ${modpath}/vmci.ko || return 1 - insmod ${modpath}/vmblock.ko || return 1 + insmod ${modpath}/vmci.ko + insmod ${modpath}/vmblock.ko + insmod ${modpath}/vsock.ko End-of-Here $modlist .= "vsock vmci vmblock"; } elsif ($kind eq 'local20' || $kind eq 'local25' || $kind eq 'vmpl2.0' || $kind eq 'vmpl2.5') { diff --git a/os-plugins/plugins/vmware/files/run-virt.include b/os-plugins/plugins/vmware/files/run-virt.include index 149dd730..6328baab 100644 --- a/os-plugins/plugins/vmware/files/run-virt.include +++ b/os-plugins/plugins/vmware/files/run-virt.include @@ -42,7 +42,7 @@ sharedFolder.option = \"alwaysEnabled\"" >>${conffile} esac case "$vmversion" in 2.5|3.*|6.5|7.*) - if [ "${cpu_cores}" -ge "2" 2>/dev/null]; then + if [ "${cpu_cores}" -ge "2" 2>/dev/null ]; then numvcpus="2" fi cap3d="TRUE" # helper var for loging output |