diff options
| author | Volker Uhrig | 2008-07-17 18:34:26 +0200 |
|---|---|---|
| committer | Volker Uhrig | 2008-07-17 18:34:26 +0200 |
| commit | 5de5662fa5582e28781c43f257b17464b41653e5 (patch) | |
| tree | 7e85ad25768391c99b614f0231c479ea3bb30f46 /os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm | |
| parent | vmchooser: (diff) | |
| download | core-5de5662fa5582e28781c43f257b17464b41653e5.tar.gz core-5de5662fa5582e28781c43f257b17464b41653e5.tar.xz core-5de5662fa5582e28781c43f257b17464b41653e5.zip | |
* Sync of changeset 1929
* reducing if statements in init script
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1931 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm')
| -rw-r--r-- | os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm index e8ec74e2..14b44e39 100644 --- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm +++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm @@ -260,9 +260,7 @@ sub checkStage3AttrValues my $vm_kind = $stage3Attrs->{'vmware::kind'} || ''; - print "DEBUG $vm_kind\n"; my $vmimg = $stage3Attrs->{'vmware::imagesrc'} || ''; - print "DEBUG $vmimg\n"; if ($vm_kind eq 'local' && ! -x "/usr/lib/vmware/bin/vmware") { push @problems, _tr( @@ -307,10 +305,11 @@ sub _writeRunlevelScript my $self = shift; my $location = shift; my $file = shift; + my $kind = shift; # $location points to the path where vmware helpers are installed # call the distrospecific fillup - my $runlevelScript = $self->{distro}->fillRunlevelScript($location); + my $runlevelScript = $self->{distro}->fillRunlevelScript($location, $kind); # OLTA: this backup strategy is useless if invoked twice, so I have # deactivated it @@ -467,7 +466,7 @@ sub _localInstallation ## ## Create runlevel script my $runlevelScript = "$self->{'pluginRepositoryPath'}/$kind/vmware.init"; - $self->_writeRunlevelScript($vmbin, $runlevelScript); + $self->_writeRunlevelScript($vmbin, $runlevelScript, $kind); ## ## Create wrapperscripts @@ -515,7 +514,7 @@ sub _vmpl2Installation { ## ## Create runlevel script my $runlevelScript = "$self->{'pluginRepositoryPath'}/$kind/vmware.init"; - $self->_writeRunlevelScript($vmbin, $runlevelScript); + $self->_writeRunlevelScript($vmbin, $runlevelScript, $kind); ## ## Create wrapperscripts @@ -561,7 +560,7 @@ sub _vmpl1Installation { ## ## Create runlevel script my $runlevelScript = "$self->{'pluginRepositoryPath'}/$kind/vmware.init"; - $self->_writeRunlevelScript($vmbin, $runlevelScript); + $self->_writeRunlevelScript($vmbin, $runlevelScript, $kind); ## ## Create wrapperscripts |