From 74be7469519e6201dd345359e5a396b2a8fafd6b Mon Sep 17 00:00:00 2001
From: Dirk
Date: Tue, 27 Nov 2012 15:49:43 +0100
Subject: Working on VirtualBox for OpenSLX clients ... (including changes for
 vmchooser)

---
 .../virtualbox/OpenSLX/OSPlugin/virtualbox.pm      | 31 ++--------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

(limited to 'src/os-plugins/plugins/virtualbox/OpenSLX/OSPlugin/virtualbox.pm')

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[^_-]"'
-- 
cgit v1.2.3-55-g7522