From 85c3afe09fbdd38acc461aa7965409a1d3ffa858 Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Fri, 19 Mar 2010 17:33:16 +0100
Subject: virtualbox, vmgrix und xen anpassungen

---
 os-plugins/plugins/vmware/XX_vmware.sh           | 9 ++++++---
 os-plugins/plugins/vmware/files/run-virt.include | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'os-plugins/plugins/vmware')

diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh
index cb8683f6..116561f6 100644
--- a/os-plugins/plugins/vmware/XX_vmware.sh
+++ b/os-plugins/plugins/vmware/XX_vmware.sh
@@ -12,6 +12,10 @@
 # script is included from init via the "." load function - thus it has all
 # variables and functions available
 
+# TODO:
+# configs nach /etc/opt/openslx/plugins/vmware
+# cp nach run-virt.include
+
 # TODO: nvram,functions
 # write /etc/vmware/config (if a non-standard location of vmware basedir is
 # to be configured), /etc/init.d/vmware
@@ -159,9 +163,8 @@ ${vmware_imagesrc}." nonfatal
 prefvmx.useRecommendedLockedMemSize = "TRUE"' | sed -e "s/^ *//" \
       >/mnt/etc/vmware/config
 
-    # copy version depending files - the vmchooser expects for every virtua-
-    # lization plugin a file named after it (here run-vmware.include)
-    cp ${PLUGINDIR}/run-virt.include ${PLUGINCONFDIR}/run-vmware.include
+    # copy virtualization include files to config dir
+    cp ${PLUGINDIR}/run-virt.include ${PLUGINCONFDIR}
     # copy version depending files
     cp ${PLUGINDIR}/${vmware_kind}/vmplayer ${BINDIR}/vmplayer
     if [ -e ${PLUGINDIR}/${vmware_kind}/vmware ]; then
diff --git a/os-plugins/plugins/vmware/files/run-virt.include b/os-plugins/plugins/vmware/files/run-virt.include
index 6328baab..e6866673 100644
--- a/os-plugins/plugins/vmware/files/run-virt.include
+++ b/os-plugins/plugins/vmware/files/run-virt.include
@@ -1,6 +1,6 @@
 # run-virt.include
 # -----------------------------------------------------------------------------
-# Copyright (c) 2009 - RZ Uni Freiburg
+# Copyright (c) 2009..2010 - RZ Uni Freiburg
 # Copyright (c) 2009..2010 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
@@ -13,7 +13,7 @@
 # -----------------------------------------------------------------------------
 # run-virt.include
 #    - component for vmware/player of the vmchooser plugin run-virt.sh
-# -----------------------------------------------------------------------------
+################################################################################
 
 # configuration writer functions
 ################################################################################
@@ -451,5 +451,5 @@ writelog ""
 ################################################################################
 
 # using the modified version of the wrapper script
-VIRTCMD=/var/opt/openslx/bin/vmplayer
+VIRTCMD="${OPENSLX_DEFAULT_BINDIR}/vmplayer"
 VIRTCMDOPTS="${vmopt} ${conffile}"
-- 
cgit v1.2.3-55-g7522