From e18714e819d6fee6d6428ce70ddbffc303415208 Mon Sep 17 00:00:00 2001 From: Volker Uhrig Date: Mon, 13 Oct 2008 12:01:49 +0000 Subject: * added missing identification of local installed vmplayer including different init script git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2287 95ad53e4-c205-0410-b2fa-d234c58c8868 --- os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm | 4 ++-- os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm | 4 ++-- os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm | 4 ++-- os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm | 4 ++-- os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm | 16 +++++++++++++--- 5 files changed, 21 insertions(+), 11 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 04c72ca4..c64c804c 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm @@ -69,7 +69,7 @@ sub fillRunlevelScript End-of-Here # Load modules - if ($kind eq 'local') { + if ($kind eq 'local' || $kind eq 'local25') { $script .= unshiftHereDoc(<<" End-of-Here"); # to be filled in via the stage1 configuration script insmod /lib/modules/\$(uname -r)/misc/vmmon.o || return 1 @@ -131,7 +131,7 @@ sub fillRunlevelScript if [ -n "\$vmnet0" ] ; then # the path might be directly point to the plugin dir End-of-Here - if ($kind eq 'vmpl2.5') { + if ($kind eq 'vmpl2.5' || $kind eq 'local25') { $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0"; } else { $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0"; diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm index 54047aca..1e3c8910 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm @@ -56,7 +56,7 @@ sub fillRunlevelScript End-of-Here # Load modules - if ($kind eq 'local') { + if ($kind eq 'local' || $kind eq 'local25') { $script .= unshiftHereDoc(<<" End-of-Here"); # to be filled in via the stage1 configuration script insmod /lib/modules/\$(uname -r)/misc/vmmon.o || return 1 @@ -116,7 +116,7 @@ sub fillRunlevelScript if [ -n "\$vmnet0" ] ; then # the path might be directly point to the plugin dir End-of-Here - if ($kind eq 'vmpl2.5') { + if ($kind eq 'vmpl2.5' || $kind eq 'local25') { $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0"; } else { $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0"; diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm index ea734467..2612fafd 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm @@ -52,7 +52,7 @@ sub fillRunlevelScript End-of-Here # load modules - if ($kind eq 'local') { + if ($kind eq 'local' || $kind eq 'local25') { $script .= unshiftHereDoc(<<" End-of-Here"); # to be filled in via the stage1 configuration script insmod /lib/modules/\$(uname -r)/misc/vmmon.o || return 1 @@ -114,7 +114,7 @@ sub fillRunlevelScript if [ -n "\$vmnet0" ] ; then # the path might be directly point to the plugin dir End-of-Here - if ($kind eq 'vmpl2.5') { + if ($kind eq 'vmpl2.5' || $kind eq 'local25') { $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0"; } else { $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0"; diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm index e9b8f121..2cbf7674 100644 --- a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm +++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm @@ -57,7 +57,7 @@ sub fillRunlevelScript End-of-Here # Load modules - if ($kind eq 'local') { + if ($kind eq 'local' || $kind eq 'local25') { $script .= unshiftHereDoc(<<" End-of-Here"); # to be filled in via the stage1 configuration script insmod /lib/modules/\$(uname -r)/misc/vmmon.o || return 1 @@ -117,7 +117,7 @@ sub fillRunlevelScript if [ -n "\$vmnet0" ] ; then # the path might be directly point to the plugin dir End-of-Here - if ($kind eq 'vmpl2.5') { + if ($kind eq 'vmpl2.5'||$kind eq 'local25') { $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid -n 0"; } else { $script .= "\$location/vmnet-bridge -d /var/run/vmnet-bridge-0.pid /dev/vmnet0 eth0"; diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm index 93a1262f..a58aa07d 100644 --- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm +++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm @@ -514,6 +514,9 @@ sub _localInstallation $vmversion = $1; $vmbuildversion = $2; } + if ($data =~ m{\0(2\.[05])\.[0-9]}) { + $vmversion = $1; + } # else { TODO: errorhandling if file or string doesn't exist } chomp($vmversion); chomp($vmbuildversion); @@ -536,18 +539,25 @@ sub _localInstallation copyFile("$pluginFilesPath/$file", "$installationPath"); } # copy depends on version and rename it to runvmware, saves one check in stage3 - if ($vmversion < "6") { + if ($vmversion eq "1.0") { print "\n\nDEBUG: player version $vmversion, we use -v1\n\n"; copyFile("$pluginFilesPath/runvmware-player-v1", "$installationPath", "runvmware"); - } else { + } elsif ($vmversion eq "2.0") { print "\n\nDEBUG: player version $vmversion, we use -v2\n\n"; copyFile("$pluginFilesPath/runvmware-player-v2", "$installationPath", "runvmware"); + } elsif ($vmversion eq "2.5") { + print "\n\nDEBUG: player version $vmversion, we use -v25\n\n"; + copyFile("$pluginFilesPath/runvmware-player-v25", "$installationPath", "runvmware"); } ## ## Create runlevel script my $runlevelScript = "$self->{'pluginRepositoryPath'}/$kind/vmware.init"; - $self->_writeRunlevelScript($vmbin, $runlevelScript, $kind); + if ($vmversion eq "2.5") { + $self->_writeRunlevelScript($vmbin, $runlevelScript, "local25"); + } else { + $self->_writeRunlevelScript($vmbin, $runlevelScript, $kind); + } ## ## Create wrapperscripts -- cgit v1.2.3-55-g7522