diff options
Diffstat (limited to 'src/os-plugins/plugins/virtualbox/OpenSLX')
5 files changed, 14 insertions, 38 deletions
diff --git a/src/os-plugins/plugins/virtualbox/OpenSLX/Distro/Base.pm b/src/os-plugins/plugins/virtualbox/OpenSLX/Distro/Base.pm index d26cdfcc..fb23c4f8 100644 --- a/src/os-plugins/plugins/virtualbox/OpenSLX/Distro/Base.pm +++ b/src/os-plugins/plugins/virtualbox/OpenSLX/Distro/Base.pm @@ -1,4 +1,4 @@ -# Copyright (c) 2009 - OpenSLX GmbH +# Copyright (c) 2012 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -50,7 +50,7 @@ sub installVbox my $engine = $self->{'engine'}; - # lets try it... we can't loose anything :) + # lets try it ... but better have it installed in the clone source system $engine->installPackages('virtualbox-ose'); return; diff --git a/src/os-plugins/plugins/virtualbox/OpenSLX/Distro/Debian.pm b/src/os-plugins/plugins/virtualbox/OpenSLX/Distro/Debian.pm index edd117ca..eeaa0627 100644 --- a/src/os-plugins/plugins/virtualbox/OpenSLX/Distro/Debian.pm +++ b/src/os-plugins/plugins/virtualbox/OpenSLX/Distro/Debian.pm @@ -1,4 +1,4 @@ -# Copyright (c) 2009 - OpenSLX GmbH +# Copyright (c) 2012 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -34,7 +34,6 @@ sub installVbox 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") { #the usual "in stage1 chroot we get another kernel vers. problem" @@ -43,6 +42,7 @@ sub installVbox #system('/etc/init.d/virtualbox-ose setup'); } else { print "Couldn't install VirtualBox, no package from distribution\n"; + print "Install and configure VirtualBox in your clone source\n"; exit; } diff --git a/src/os-plugins/plugins/virtualbox/OpenSLX/Distro/Suse.pm b/src/os-plugins/plugins/virtualbox/OpenSLX/Distro/Suse.pm index 9af3191e..6b571d6b 100644 --- a/src/os-plugins/plugins/virtualbox/OpenSLX/Distro/Suse.pm +++ b/src/os-plugins/plugins/virtualbox/OpenSLX/Distro/Suse.pm @@ -1,4 +1,4 @@ -# Copyright (c) 2009 - OpenSLX GmbH +# Copyright (c) 2012 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -35,10 +35,12 @@ sub installVbox my $release = `lsb_release -rs`; chomp($release); - if ( $release eq "11.1" || $release eq "11.0" || $release eq "10.3") { - $engine->installPackages('virtualbox-ose'); + if ( $release eq "12.2" || $release eq "12.1" ) { + $engine->installPackages('VirtualBox'); } else { print "Couldn't install VirtualBox, no package from distribution\n"; + print "Install and configure VirtualBox in your clone source\n"; + exit; } diff --git a/src/os-plugins/plugins/virtualbox/OpenSLX/Distro/Ubuntu.pm b/src/os-plugins/plugins/virtualbox/OpenSLX/Distro/Ubuntu.pm index 44695680..ac270747 100644 --- a/src/os-plugins/plugins/virtualbox/OpenSLX/Distro/Ubuntu.pm +++ b/src/os-plugins/plugins/virtualbox/OpenSLX/Distro/Ubuntu.pm @@ -1,4 +1,4 @@ -# Copyright (c) 2008 - OpenSLX GmbH +# Copyright (c) 2012 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -36,7 +36,7 @@ sub installVbox my $release = `lsb_release -rs`; chomp($release); - # hardy (8.04LTS): only version VBox v1.5 + # does not really makes sense to install it into stage2 if ( $release eq "8.10" || $release eq "9.04") { #the usual "in stage1 chroot we get another kernel vers. problem" # kernel modules need to be installed from the cloned system @@ -44,6 +44,7 @@ sub installVbox #system('/etc/init.d/virtualbox-ose setup'); } else { print "Couldn't install VirtualBox, no package from distribution!\n"; + print "Install and configure VirtualBox in your clone source\n"; exit; } diff --git a/src/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm b/src/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm index 07ec9dc0..d07cd92f 100644 --- a/src/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm +++ b/src/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm @@ -1,5 +1,5 @@ # Copyright (c) 2009..2010 - RZ Uni Freiburg -# Copyright (c) 2009..2010 - OpenSLX GmbH +# Copyright (c) 2009..2012 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -85,8 +85,6 @@ sub getAttrInfo }, # attribute 'bridge' defines if bridged network mode should be # switched on - # TODO: change to net -> nat, bridge, hostonly? - # TODO: since we use def in XML maybe use to override 'virtualbox::bridge' => { applies_to_systems => 1, applies_to_clients => 1, @@ -98,30 +96,6 @@ sub getAttrInfo content_descr => '0 or 1', default => '1', }, - # attribute 'mem' defines if memory should be forced - 'virtualbox::mem' => { - applies_to_systems => 1, - applies_to_clients => 1, - description => unshiftHereDoc(<<' End-of-Here'), - Do you want to force a ralative amount of RAM? - (Not implemented right now!) - End-of-Here - content_regex => qr{^(\d\d??)$}, - content_descr => 'Between 0 - 99', - default => undef, - }, - # attribute 'kvm' defines if KVM modules should be forced - 'virtualbox::kvm' => { - applies_to_systems => 1, - applies_to_clients => 1, - description => unshiftHereDoc(<<' End-of-Here'), - Do you want to force the usage of KVM modules where applicable? - (Not implemented right now!) - End-of-Here - content_regex => qr{^(0|1)$}, - content_descr => '0 or 1', - default => undef, - }, # attribute 'tftpdir' defines TFTP dir for network boots /w NAT 'virtualbox::tftpdir' => { applies_to_systems => 1, @@ -192,7 +166,6 @@ sub checkStage3AttrValues my $self = shift; my $stage3Attrs = shift; my $vendorOSAttrs = shift; - #my @problems; #my $vmimg = $stage3Attrs->{'virtualbox::imagesrc'} || ''; @@ -209,7 +182,7 @@ sub _writeRunlevelScript $initfile->setName("vbox-slx"); $initfile->setDesc("Setup environment for virtualbox. Part of OpenSLX virtualbox plugin."); - # todo: Function need to be formated proper... not important right now + # todo: Function need to be formated properly ... $initfile->addFunction( 'running', 'lsmod | grep -q "$1[^_-]"' |