* workaround for init-file

* disabled virtualbox installation till installation process got fixed


git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3004 95ad53e4-c205-0410-b2fa-d234c58c8868

4 files changed, 16 insertions, 16 deletions

diff --git a/os-plugins/plugins/virtualbox/OpenSLX/Distro/Base.pm b/os-plugins/plugins/virtualbox/OpenSLX/Distro/Base.pm
index e624b897..f23a1142 100644
--- a/os-plugins/plugins/virtualbox/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/virtualbox/OpenSLX/Distro/Base.pm
@@ -51,9 +51,9 @@ sub installVbox
     my $engine = $self->{'os-plugin-engine'};
 
     # lets try it... we can't loose anything :)
-	$engine->installPackages(
-         $engine->getInstallablePackagesForSelection('virtualbox-ose')
-	);
+	#$engine->installPackages(
+    #     $engine->getInstallablePackagesForSelection('virtualbox-ose')
+	#);
 
     return;
 }
diff --git a/os-plugins/plugins/virtualbox/OpenSLX/Distro/Debian.pm b/os-plugins/plugins/virtualbox/OpenSLX/Distro/Debian.pm
index 17f224ac..2cd03647 100644
--- a/os-plugins/plugins/virtualbox/OpenSLX/Distro/Debian.pm
+++ b/os-plugins/plugins/virtualbox/OpenSLX/Distro/Debian.pm
@@ -32,14 +32,14 @@ sub installVbox
 
     my $engine = $self->{'os-plugin-engine'};
     my $release = `lsb_release -rs`;
+    chomp($release);
 
     # 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(
+        #    $engine->getInstallablePackagesForSelection('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 ebdf1835..b7e194a6 100644
--- a/os-plugins/plugins/virtualbox/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/virtualbox/OpenSLX/Distro/Suse.pm
@@ -32,12 +32,12 @@ sub installVbox
 
     my $engine = $self->{'os-plugin-engine'};
     my $release = `lsb_release -rs`;
+    chomp($release);
     
     if ( $release eq "11.1" || $release eq "11.0" || $release eq "10.3") {
-        $engine->installPackages(
-            $engine->getInstallablePackagesForSelection('virtualbox-ose')
-        
-        );
+        #$engine->installPackages(
+        #    $engine->getInstallablePackagesForSelection('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 03dce150..e3a910dc 100644
--- a/os-plugins/plugins/virtualbox/OpenSLX/Distro/Ubuntu.pm
+++ b/os-plugins/plugins/virtualbox/OpenSLX/Distro/Ubuntu.pm
@@ -19,12 +19,12 @@ use warnings;
 
 # inherit everything from Debian (as Ubuntu is based on it anyway)
 use base qw(virtualbox::OpenSLX::Distro::Debian);
-
 use base qw(virtualbox::OpenSLX::Distro::Base);
 
 use OpenSLX::Basics;
 use OpenSLX::Utils;
 
+
 ################################################################################
 #### interface methods
 ################################################################################
@@ -35,13 +35,13 @@ sub installVbox
 
     my $engine = $self->{'os-plugin-engine'};
     my $release = `lsb_release -rs`;
+    chomp($release);
 
     # 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(
+#            $engine->getInstallablePackagesForSelection('virtualbox-ose')
+#        );
     } else {
         print "Couldn't install VirtualBox, no package from distribution!\n";
         exit;