summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk2014-04-27 20:02:53 +0200
committerDirk2014-04-27 20:02:53 +0200
commit6c6d14c18c4a476735f4214e11fa1533ad9ec5a5 (patch)
tree4a291bf4a04c38f37e7d6d14ae2af33be86c52c4
parentFixing typo ... (diff)
downloadcore-6c6d14c18c4a476735f4214e11fa1533ad9ec5a5.tar.gz
core-6c6d14c18c4a476735f4214e11fa1533ad9ec5a5.tar.xz
core-6c6d14c18c4a476735f4214e11fa1533ad9ec5a5.zip
Cleanup ...
-rw-r--r--src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm130
1 files changed, 3 insertions, 127 deletions
diff --git a/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
index 136c6b16..8f7f791a 100644
--- a/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
+++ b/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
@@ -134,9 +134,7 @@ sub getAttrInfo
Which set of VMware binaries to use: installed (local)?
(Only pre-installed in the clone versions will work)
End-of-Here
- # only allow the supported once...
- # TODO: modify if we know which of them work
- #content_regex => qr{^(local|vmws(5\.5|6.0)|vmpl(1\.0|2\.0))$},
+ # only allow the supported ones
content_regex => qr{^(local)$},
content_descr => 'Allowed values: local',
#TODO: what if we don't have a local installation. default
@@ -185,23 +183,6 @@ sub preInstallationPhase()
print " * vmware plugin was not installed!\n\n";
exit 1;
}
-
- if (! -d $pkgpath && ($vmpl10 == 1 || $vmpl20 == 1 || $vmpl25 == 1)) {
- print "\n\n * vmware::pkgpath: no such directory $pkgpath!\n";
- print " See wiki about vmware Plugin\n";
- print " * vmware plugin was not installed!\n\n";
- exit 1;
- }
-
- # test just for the case we only set up local vmware
- if (-d $pkgpath && ($vmpl10 == 1 || $vmpl20 == 1 || $vmpl25 == 1)) {
- # todo: ask oliver about a similiar function
- # like copyFile() just for directorys
- # or fix the manual after checked the source of
- # copyFile() function. check if copyFile etc. perldoc
- # is somewhere in the wiki documented else do it!
- system("cp -r $pkgpath $self->{pluginRepositoryPath}/packages");
- }
}
sub installationPhase
@@ -341,7 +322,7 @@ sub _writeRunlevelScript
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') {
+ } elsif ($kind eq 'local20' || $kind eq 'local25') {
$script .= unshiftHereDoc(<<" End-of-Here");
# VMplayer 2.X specific stuff
insmod ${modpath}/vmblock.ko
@@ -514,7 +495,7 @@ sub _writeWrapperScript
End-of-Here
# TODO: check if these will be overwritten if we have more as
- # local defined (add the version/type like vmpl1.0, vmws5.5, ...)
+ # local defined (add the version/type like local, ...)
# then we have a lot of files easily distinguishable by there suffix
spitFile("$self->{'pluginRepositoryPath'}/$kind/$file", $script);
chmod 0755, "$self->{'pluginRepositoryPath'}/$kind/$file";
@@ -669,111 +650,6 @@ sub _localInstallation
$self->_writeVmwareConfigs("$kind", "$vmpath");
}
-sub _vmpl2Installation {
- my $self = shift;
-
- my $kind = "vmpl2.0";
- my $vmpath = "/opt/openslx/plugin-repo/vmware/$kind/vmroot/lib/vmware";
- my $vmbin = "/opt/openslx/plugin-repo/vmware/$kind/vmroot/bin";
-
- my $pluginFilesPath
- = "$self->{'openslxBasePath'}/lib/plugins/$self->{'name'}/files";
- my $installationPath = "$self->{'pluginRepositoryPath'}/$kind";
-
- mkpath($installationPath);
-
- ##
- ## Copy needed files
-
- # copy 'normal' needed files
- my @files = qw( nvram install-vmpl.sh );
- foreach my $file (@files) {
- copyFile("$pluginFilesPath/$file", "$installationPath");
- }
-
- # Install the binarys from given pkgpath
- system("/bin/sh /opt/openslx/plugin-repo/$self->{'name'}/$kind/install-vmpl.sh $kind");
-
- # Create runlevel script
- $self->_writeRunlevelScript($vmpath, $kind);
-
- # Create wrapperscripts
- $self->_writeWrapperScript("$vmpath", "$kind", "player");
-
- # Creating needed config /etc/vmware/config
- $self->_writeVmwareConfigs("$kind", "$vmpath");
-
-}
-
-sub _vmpl25Installation {
- my $self = shift;
-
- my $kind = "vmpl2.5";
- my $vmpath = "/opt/openslx/plugin-repo/vmware/$kind/vmroot/lib/vmware";
- my $vmbin = "/opt/openslx/plugin-repo/vmware/$kind/vmroot/bin";
- my $vmversion = "6.5";
- my $vmbuildversion = "TODO_we_need_it_for_enhanced_runvmware_config_in_stage1";
-
- my $pluginFilesPath
- = "$self->{'openslxBasePath'}/lib/plugins/$self->{'name'}/files";
- my $installationPath = "$self->{'pluginRepositoryPath'}/$kind";
-
- mkpath($installationPath);
-
- # copy 'normal' needed files
- my @files = qw( nvram install-vmpl.sh );
- foreach my $file (@files) {
- copyFile("$pluginFilesPath/$file", "$installationPath");
- }
-
- # Install the binarys from given pkgpath
- system("/bin/sh /opt/openslx/plugin-repo/$self->{'name'}/$kind/install-vmpl.sh $kind");
-
- # Create runlevel script
- $self->_writeRunlevelScript($vmpath, $kind);
-
- # Create wrapperscripts
- $self->_writeWrapperScript("$vmpath", "$kind", "player");
-
- # Creating needed config /etc/vmware/config
- $self->_writeVmwareConfigs("$kind", "$vmpath");
-
-}
-
-sub _vmpl1Installation {
- my $self = shift;
-
- my $kind = "vmpl1.0";
- my $vmpath = "/opt/openslx/plugin-repo/vmware/$kind/vmroot/lib/vmware";
- my $vmbin = "/opt/openslx/plugin-repo/vmware/$kind/vmroot/bin";
- my $vmversion = "5.5";
- my $vmbuildversion = "TODO_we_need_it_for_enhanced_runvmware_config_in_stage1";
-
- my $pluginFilesPath
- = "$self->{'openslxBasePath'}/lib/plugins/$self->{'name'}/files";
- my $installationPath = "$self->{'pluginRepositoryPath'}/$kind";
-
- mkpath($installationPath);
-
- # copy 'normal' needed files
- my @files = qw( nvram install-vmpl.sh );
- foreach my $file (@files) {
- copyFile("$pluginFilesPath/$file", "$installationPath");
- }
-
- # Download and install the binarys
- system("/bin/sh /opt/openslx/plugin-repo/$self->{'name'}/$kind/install-vmpl.sh $kind");
-
- # Create runlevel script
- $self->_writeRunlevelScript($vmpath, $kind);
-
- # create wrapper scripts
- $self->_writeWrapperScript("$vmpath", "$kind", "player");
-
- # creating needed config /etc/vmware/config
- $self->_writeVmwareConfigs("$kind", "$vmpath");
-
-}
# The bridge configuration needs the bridge module to be present in early
# stage3