From 4e65ca9800ea97a9dbee257b9a40dcbaeb99bb88 Mon Sep 17 00:00:00 2001 From: Dirk von Suchodoletz Date: Mon, 2 Jun 2008 15:50:09 +0000 Subject: 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 --- os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm | 15 ++++++--------- os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm | 15 ++++++--------- os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm | 15 ++++++--------- os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm | 15 ++++++--------- os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm | 12 +++++++----- 5 files changed, 31 insertions(+), 41 deletions(-) (limited to 'os-plugins/plugins/vmware/OpenSLX') diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm index 25e14e1c..2dfc2700 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm @@ -99,6 +99,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 ... @@ -112,14 +115,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-vmnet8.pid vmnet8 fi } case \$1 in @@ -131,7 +129,6 @@ sub fillRunlevelScript setup_vmnet0 setup_vmnet1 setup_vmnet8 - runvmdhcpd ;; stop) # message output should match the given vendor-os 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) diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm index bb8c124a..c11994f1 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm @@ -82,6 +82,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-vmnet8.conf \\ + -lf /var/run/vmware/dhcpd-vmnet1.leases \\ + -pf /var/run/vmnet-dhcpd-vmnet1.pid vmnet1 fi } # incomplete ... @@ -95,14 +98,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-vmnet8.pid vmnet8 fi } @@ -115,7 +113,6 @@ sub fillRunlevelScript setup_vmnet0 || eerror "Problems setting up vmnet0 interface" setup_vmnet1 || eerror "Problems setting up vmnet1 interface" setup_vmnet8 || eerror "Problems setting up vmnet8 interface" - runvmdhcpd eend $? } diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm index e649f27c..7e09e3c9 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.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-vmnet8.pid vmnet8 fi } # load the helper stuff @@ -128,7 +126,6 @@ sub fillRunlevelScript setup_vmnet0 setup_vmnet1 setup_vmnet8 - runvmdhcpd rc_status -v ;; stop) diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm index aa3bb832..4207a12d 100644 --- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm +++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm @@ -41,7 +41,9 @@ sub getInfo return { description => unshiftHereDoc(<<' End-of-Here'), - !!! descriptive text missing here !!! + Module for enabling services of VMware Inc. on an OpenSLX stateless + client. This plugin might use pre-existing installations of VMware + tools or install addional variants and versions. End-of-Here precedence => 70, }; @@ -337,7 +339,7 @@ sub _localInstallation if (-e "/usr/lib/vmware/bin/vmplayer") { ## - ## Get and write version informations + ## Get and write version information # get version information about installed vmplayer open(FH, "/usr/lib/vmware/bin/vmplayer"); @@ -368,11 +370,11 @@ sub _localInstallation ## Copy needed files # copy 'normal' needed files - my @files = qw( nvram.5.0); + my @files = qw(nvram.5.0); foreach my $file (@files) { copyFile("$pluginFilesPath/$file", "$installationPath"); } - # copy depends on version and rename it to runvmware, safes one check in stage3 + # copy depends on version and rename it to runvmware, saves one check in stage3 if ($vmversion < "6") { print "\n\nDEBUG: player version $vmversion, we use -v1\n\n"; copyFile("$pluginFilesPath/runvmware-player-v1", "$installationPath", "runvmware"); @@ -395,7 +397,7 @@ sub _localInstallation } ## - ## replacement with our, faster wrapper script + ## replacement with our faster wrapper script # rename the default vmplayer script and copy it. remove function takes # care about plugin remove. We only need this part if vmplayer -- cgit v1.2.3-55-g7522