summaryrefslogtreecommitdiffstats
path: root/os-plugins
diff options
context:
space:
mode:
authorVolker Uhrig2009-07-19 12:12:13 +0200
committerVolker Uhrig2009-07-19 12:12:13 +0200
commit9d9beb31a114bc698974758a6decb345a595f339 (patch)
treeb1ff9f36dbbaf23cce98e443847bc916cc75a6d3 /os-plugins
parentThe "persist" option to nbd-client could fix the connection losses reported ... (diff)
downloadcore-9d9beb31a114bc698974758a6decb345a595f339.tar.gz
core-9d9beb31a114bc698974758a6decb345a595f339.tar.xz
core-9d9beb31a114bc698974758a6decb345a595f339.zip
* Added changes
* Installation doesnt work, debug code in Ubuntu.pm git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3016 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
-rw-r--r--os-plugins/plugins/virtualbox/OpenSLX/Distro/Base.pm4
-rw-r--r--os-plugins/plugins/virtualbox/OpenSLX/Distro/Debian.pm4
-rw-r--r--os-plugins/plugins/virtualbox/OpenSLX/Distro/Suse.pm4
-rw-r--r--os-plugins/plugins/virtualbox/OpenSLX/Distro/Ubuntu.pm11
4 files changed, 10 insertions, 13 deletions
diff --git a/os-plugins/plugins/virtualbox/OpenSLX/Distro/Base.pm b/os-plugins/plugins/virtualbox/OpenSLX/Distro/Base.pm
index f23a1142..3b62c416 100644
--- a/os-plugins/plugins/virtualbox/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/virtualbox/OpenSLX/Distro/Base.pm
@@ -51,9 +51,7 @@ sub installVbox
my $engine = $self->{'os-plugin-engine'};
# lets try it... we can't loose anything :)
- #$engine->installPackages(
- # $engine->getInstallablePackagesForSelection('virtualbox-ose')
- #);
+ $engine->installPackages('virtualbox-ose');
return;
}
diff --git a/os-plugins/plugins/virtualbox/OpenSLX/Distro/Debian.pm b/os-plugins/plugins/virtualbox/OpenSLX/Distro/Debian.pm
index 2cd03647..eeb35e54 100644
--- a/os-plugins/plugins/virtualbox/OpenSLX/Distro/Debian.pm
+++ b/os-plugins/plugins/virtualbox/OpenSLX/Distro/Debian.pm
@@ -37,9 +37,7 @@ sub installVbox
# lenny(5.0) has v1.6
# testing is ok. but no clue which lsb_release -rs it has...
if ( $release eq "999999.0") {
- #$engine->installPackages(
- # $engine->getInstallablePackagesForSelection('virtualbox-ose')
- #);
+ $engine->installPackages('virtualbox-ose');
} else {
print "Couldn't install VirtualBox, no package from distribution\n";
exit;
diff --git a/os-plugins/plugins/virtualbox/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/virtualbox/OpenSLX/Distro/Suse.pm
index b7e194a6..46dec675 100644
--- a/os-plugins/plugins/virtualbox/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/virtualbox/OpenSLX/Distro/Suse.pm
@@ -35,9 +35,7 @@ sub installVbox
chomp($release);
if ( $release eq "11.1" || $release eq "11.0" || $release eq "10.3") {
- #$engine->installPackages(
- # $engine->getInstallablePackagesForSelection('virtualbox-ose')
- #);
+ $engine->installPackages('virtualbox-ose');
} else {
print "Couldn't install VirtualBox, no package from distribution\n";
exit;
diff --git a/os-plugins/plugins/virtualbox/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/virtualbox/OpenSLX/Distro/Ubuntu.pm
index e3a910dc..35b851a2 100644
--- a/os-plugins/plugins/virtualbox/OpenSLX/Distro/Ubuntu.pm
+++ b/os-plugins/plugins/virtualbox/OpenSLX/Distro/Ubuntu.pm
@@ -28,7 +28,6 @@ use OpenSLX::Utils;
################################################################################
#### interface methods
################################################################################
-
sub installVbox
{
my $self = shift;
@@ -39,9 +38,13 @@ sub installVbox
# hardy (8.04LTS): only version VBox v1.5
if ( $release eq "8.10" || $release eq "9.04") {
-# $engine->installPackages(
-# $engine->getInstallablePackagesForSelection('virtualbox-ose')
-# );
+ #$engine->installPackages("virtualbox-ose");
+ for my $key ( keys %$self ) {
+ # we don't into this routine
+ print "DEBUG: $key\n";
+ }
+ my $size = scalar(keys %$self);
+ print "Size: $size\n";
} else {
print "Couldn't install VirtualBox, no package from distribution!\n";
exit;