From ec7d9e4583d80e65163061132346b2db4907b7c7 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Thu, 19 Feb 2009 02:22:13 +0000
Subject: Do not depend the vmchooser on vmware plugin.

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2617 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm | 6 ++++--
 os-plugins/plugins/vmchooser/files/run-virt.sh             | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'os-plugins/plugins')

diff --git a/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm b/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm
index 86a79e05..096b6d0f 100644
--- a/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm
+++ b/os-plugins/plugins/vmchooser/OpenSLX/OSPlugin/vmchooser.pm
@@ -39,10 +39,12 @@ sub getInfo
     return {
         description => unshiftHereDoc(<<'        End-of-Here'),
             allows user to pick from a list of different virtual machine images
-            based on xml-files, which tell about available images.
+            based on xml-files, which tell about available images. One of the
+            virtualization tools like vmware*, virtualbox or qemu/kvm is
+            required.
         End-of-Here
         precedence => 50,
-        required => [ qw( vmware ) ],
+        required => [ qw( desktop ) ],
     };
 }
 
diff --git a/os-plugins/plugins/vmchooser/files/run-virt.sh b/os-plugins/plugins/vmchooser/files/run-virt.sh
index 7cb8b36b..205179e7 100644
--- a/os-plugins/plugins/vmchooser/files/run-virt.sh
+++ b/os-plugins/plugins/vmchooser/files/run-virt.sh
@@ -26,7 +26,7 @@
 
 # test if the xml path/file is valid (gotten via commandline first parameter)
 xml=$1
-[ -e "${xml}" ] || { echo -e "\n\tNo XML file given!\n" && exit 1; }
+[ -e "${xml}" ] || { echo -e "\n\tNo XML file given!\n"; exit 1; }
 
 # path to the xml file(just take the path to the xml file)
 imagepath=${xml%/*}
@@ -37,6 +37,7 @@ imagepath=${xml%/*}
 # file name of the image
 imagename=$(grep -i "<image_name param=\"" ${xml} | awk -F "\"" '{ print $2 }')
 diskfile=$imagepath/$imagename
+[ -e $diskfile ] && { echo -e "\n\tImage file $diskfile not found!"; exit 1; }
 
 # short description of the image (as present in the vmchooser menu line)
 short_description=$(grep "short_description param=\"" ${xml} | \
-- 
cgit v1.2.3-55-g7522