From a515ed419db01da03f50570debd69e66c148e3d4 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Thu, 22 Jan 2009 15:19:18 +0000
Subject: (Hopefully) final fix for the new directory scheme of the
 virtualization environments. Please check that your variable of vmchooser
 "xmlpath" is updated to "/var/lib/virt/vmware/vmwareNN" NN is the version of
 the workstation (e.g. 65 for the new 6.5.X version). The *.xml description
 files are now expected in the respective path living beside the *.vmdk again!

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2516 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 VERSIONS                                           |  2 +-
 .../plugins/vmware/files/runvmware-player-v25      | 32 ++++++++++------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/VERSIONS b/VERSIONS
index 615adf02..00fe1d1d 100644
--- a/VERSIONS
+++ b/VERSIONS
@@ -1,4 +1,4 @@
 OPENSLX_VERSION_MAJOR="4"
 OPENSLX_VERSION_MINOR="9"
-OPENSLX_VERSION_RELEASE="7"
+OPENSLX_VERSION_RELEASE="8"
 OPENSLX_VERSION_STRING="${OPENSLX_VERSION_MAJOR}.${OPENSLX_VERSION_MINOR}.${OPENSLX_VERSION_RELEASE}${OPENSLX_SVN_SNAPSHOT:+rev$OPENSLX_VERSION_SVNREV}"
diff --git a/os-plugins/plugins/vmware/files/runvmware-player-v25 b/os-plugins/plugins/vmware/files/runvmware-player-v25
index 7bd99a32..391c0639 100644
--- a/os-plugins/plugins/vmware/files/runvmware-player-v25
+++ b/os-plugins/plugins/vmware/files/runvmware-player-v25
@@ -1,17 +1,19 @@
 #!/bin/bash
+# -----------------------------------------------------------------------------
+# Copyright (c) 2007..2009 - RZ Uni FR
+# Copyright (c) 2007..2009 - OpenSLX GmbH
 #
-# Description:  Script for preparing VMware environment Diskless
-#               X Stations and interactive session chooser (v4)
-#               Gets a xml file, reads needed information from it and
-#               orwards it into B drive of vmplayer
+# This program is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
 #
-# Author(s):    see project authors file
-#               last changes mj0, 20/10/2008
-# Copyright:    (c) 2003 - 2008 - RZ Universitaet Freiburg
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your suggestions, praise, or complaints to feedback@openslx.org
 #
-# Version:      0.19.1
-#
-################################################################################
+# General information about OpenSLX can be found at http://openslx.org/
+# -----------------------------------------------------------------------------
+# runvmware-player-v25
+#    - processed in stage3 and available in stage4 as VMplayer 2.5 start script
+# -----------------------------------------------------------------------------
 
 ################################################################################
 ##
@@ -138,8 +140,9 @@ hver=7
 # TODO: Test it commented out
 hostname="VM-${HOST}"
 
-# Folder of VirtualMachine Images
-vmdir="/var/lib/vmware"
+# Folder of VirtualMachine Images (VMDKs of that type. Compatible images might
+# be found in older version folders too ...)
+vmdir="/var/lib/virt/vmware/vmware65"
 
 # special Variables, persistence vmware?
 #TODO: do we really need it? Should be everywhere nonpersistent
@@ -179,11 +182,6 @@ if [ $(echo ${imagename} | grep -cv "\-flat.vmdk") ]; then
   fi
 fi
 
-# command line variables
-# start with this this default commmand line options + extra
-# TODO: defaults laut datei --include /var/lib/vmware/tmpl/winconfig
-#     --include <includefile> include code right before program start
-
 # Should we debug? Hell yes, we should always debug!
 debug=0
 
-- 
cgit v1.2.3-55-g7522