diff options
| author | Dirk von Suchodoletz | 2010-03-01 10:04:12 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2010-03-01 10:04:12 +0100 |
| commit | 6dafa67fd981ec448f46f3809cafb55d9c0bbaef (patch) | |
| tree | c1d876658dad50cce31956d7529c730270ecb01c | |
| parent | Changing directory 'X11/sessions' to 'X11/session' as this one seems to (diff) | |
| download | core-6dafa67fd981ec448f46f3809cafb55d9c0bbaef.tar.gz core-6dafa67fd981ec448f46f3809cafb55d9c0bbaef.tar.xz core-6dafa67fd981ec448f46f3809cafb55d9c0bbaef.zip | |
Some corrections in vmware plugin ... completing the shift to udhcpd and
Linux supported NAT for better handling of incoming connections.
| -rw-r--r-- | os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm | 6 | ||||
| -rw-r--r-- | os-plugins/plugins/vmware/files/run-virt.include | 13 |
2 files changed, 13 insertions, 6 deletions
diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm index 72629a14..ba1800ee 100644 --- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm +++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm @@ -466,9 +466,9 @@ sub _writeRunlevelScript /dev/vmnet8 vmnet8 ip addr add \$vmnet8 dev vmnet8 ip link set vmnet8 up - # /etc/vmware/vmnet-natd-8.mac simply contains a mac like 00:50:56:F1:30:50 - # \$location/vmnet-natd -d /var/run/vmnet-natd-8.pid \\ - # -m /etc/vmware/vmnet-natd-8.mac -c /etc/vmware/nat.conf 2>/dev/null # or logfile + echo "1" >/proc/sys/net/ipv4/conf/vmnet8/forwarding 2>/dev/null + echo "1" >/proc/sys/net/ipv4/conf/br0/forwarding 2>/dev/null + iptables -t nat -A POSTROUTING -o br0 -j MASQUERADE /opt/openslx/uclib-rootfs/usr/sbin/udhcpd \\ -S /etc/vmware/udhcpd/udhcpd-vmnet8.conf fi diff --git a/os-plugins/plugins/vmware/files/run-virt.include b/os-plugins/plugins/vmware/files/run-virt.include index 0fb1d228..149dd730 100644 --- a/os-plugins/plugins/vmware/files/run-virt.include +++ b/os-plugins/plugins/vmware/files/run-virt.include @@ -300,9 +300,16 @@ case "$parallel" in ;; esac -# percentage of memory to use for vmwares in standard case -permem=30 -if [ "${totalmem}" -ge "1600" ]; then +# adjust memory available for vmware guests +case "$vmversion" in + 2.*) + permem=30 + ;; + 3.*) + permem=25 + ;; +esac +if [ "${totalmem}" -ge "2500" ]; then permem=40 fi # check if /tmp is on harddisk |