Moving virtual dos floppy stuff into vmchooser plugin.

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

3 files changed, 23 insertions, 9 deletions

diff --git a/AUTHORS b/AUTHORS
index d8a3b722..9e59c028 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,7 +9,7 @@ Tobias Maier, <>, 2005 - 2006
 Bastian Wissler, <>, 2006 - 2009
 Lars Mueller, <lm@OpenSLX.com>, 2006 - 2009
 Oliver Tappe, <ot@OpenSLX.com>, 2006 - 2009
-Volker Uhrig, <>, 2007 - 2009
+Volker Uhrig, <>, 2007 - 2008
 Sebastian Schmelzer, <>, 2007 - 2009
 Marco Haustein, <>, 2007 - 2008
 Julian Bader, <>, 2008 - 2009
diff --git a/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm b/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm
index 8b26ef42..81ee6dce 100644
--- a/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm
+++ b/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm
@@ -1,4 +1,4 @@
-# Copyright (c) 2008 - OpenSLX GmbH
+# Copyright (c) 2008, 2009 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
 # See http://openslx.org/COPYING
@@ -9,7 +9,7 @@
 # General information about OpenSLX can be found at http://openslx.org/
 # -----------------------------------------------------------------------------
 # vmchooser.pm
-#    - allows user to pick from a list of virtual machin images
+#    - allows user to pick from a list of virtual machine images
 # -----------------------------------------------------------------------------
 package OpenSLX::OSPlugin::vmchooser;
 
@@ -79,14 +79,12 @@ sub getAttrInfo
                  location of XML configuration for virtual images
             End-of-Here
             content_descr => 'path to xml files',
-            # workaround till we wiped out vmconfigs/ folder
-            default => '/var/lib/virt/vmware/vmconfigs/',
+            default => '/var/lib/virt',
         },
 
     };
 }
 
-
 sub installationPhase
 {
     my $self = shift;
@@ -98,13 +96,12 @@ sub installationPhase
     # copy all needed files now:
     my $pluginName = $self->{'name'};
     my $pluginBasePath = "$openslxBasePath/lib/plugins/$pluginName/files";
-    foreach my $file ( qw( vmchooser printer.sh scanner.sh xmlfilter.sh default.desktop vmchooser.sh mesgdisp ) ) {
+    foreach my $file ( qw( vmchooser printer.sh scanner.sh xmlfilter.sh 
+        default.desktop vmchooser.sh mesgdisp run-virt.sh ) ) {
         copyFile("$pluginBasePath/$file", "$pluginRepoPath/");
     chmod 0755, "$pluginRepoPath/$file";
     }
     
-    #copyFile("$pluginBasePath/default.desktop", "/usr/share/xsessions/");
-
     return;
 }
 
@@ -116,5 +113,22 @@ sub removalPhase
     return;
 }
 
+sub copyRequiredFilesIntoInitramfs
+{
+    my $self                = shift;
+    my $targetPath         = shift;
+    my $attrs               = shift;
+    my $makeInitRamFSEngine = shift;
+    my $pluginRepoPath = "$openslxConfig{'base-path'}/lib/plugins/vmchooser";
+    
+    $makeInitRamFSEngine->addCMD(
+       "cp -p $pluginRepoPath/files/mkdosfs $targetPath/bin"
+    );
+
+    vlog(1, _tr("vmchooser-plugin: ..."));
+
+    return;
+}
+
 1;
 
diff --git a/os-plugins/plugins/vmware/files/mkdosfs b/os-plugins/plugins/vmware/files/mkdosfs
deleted file mode 100755
index db928bcf..00000000
--- a/os-plugins/plugins/vmware/files/mkdosfs
+++ /dev/null