diff options
| author | Dirk von Suchodoletz | 2008-06-02 17:50:09 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2008-06-02 17:50:09 +0200 |
| commit | 4e65ca9800ea97a9dbee257b9a40dcbaeb99bb88 (patch) | |
| tree | bbbdf388935007843191c4c77e7ae989fd930b1d /os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm | |
| parent | Maybe we should keep start_x for a while, since we need a configuration for t... (diff) | |
| download | core-4e65ca9800ea97a9dbee257b9a40dcbaeb99bb88.tar.gz core-4e65ca9800ea97a9dbee257b9a40dcbaeb99bb88.tar.xz core-4e65ca9800ea97a9dbee257b9a40dcbaeb99bb88.zip | |
Little bit of cleanup in vmware plugin and dealing with the
restricted capabilities of vmware-dhcpd server ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1834 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm')
| -rw-r--r-- | os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm index 6056fc38..5991d6ad 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm @@ -89,6 +89,9 @@ sub fillRunlevelScript echo "1" > /proc/sys/net/ipv4/conf/eth0/forwarding 2>/dev/null #iptables -A -s vmnet1 -d eth0 fi + $location/vmnet-dhcpd -cf /etc/vmware/dhcpd-vmnet1.conf -lf \\ + /var/run/vmware/dhcpd-vmnet1.leases \\ + -pf /var/run/vmnet-dhcpd-vmnet1.pid vmnet1 fi } # incomplete ... @@ -104,14 +107,9 @@ sub fillRunlevelScript # /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 - dhcpif="\$dhcpif vmnet8" - fi - } - runvmdhcpd() { - if [ -n "\$dhcpif" ] ; then - # the path might be directly point to the plugin dir - $location/vmnet-dhcpd -cf /etc/vmware/dhcpd.conf -lf \\ - /var/run/vmware/dhcpd.leases -pf /var/run/vmnet-dhcpd-vmnet8.pid \$dhcpif + $location/vmnet-dhcpd -cf /etc/vmware/dhcpd-vmnet8.conf \\ + -lf /var/run/vmware/dhcpd-vmnet8.leases \\ + -pf /var/run/vmnet-dhcpd-vmnet1.pid vmnet8 fi } # initialize the lsb status messages @@ -126,7 +124,6 @@ sub fillRunlevelScript setup_vmnet0 || log_warning_msg "Problems setting up vmnet0 interface" setup_vmnet1 || log_warning_msg "Problems setting up vmnet1 interface" setup_vmnet8 || log_warning_msg "Problems setting up vmnet8 interface" - runvmdhcpd || log_warning_msg "Problems starting vmware dhcpd" log_end_msg $? ;; stop) |