added shared folder support for player 2+

changed cdrom-check since vm won't start with cdrom on ide1.1
added support for start in fvwm, since starting with no windowmanager causes player 2+ to open windows in the background -> vm freezes

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

3 files changed, 47 insertions, 29 deletions

diff --git a/os-plugins/plugins/vmware/files/runvmware-player-v1 b/os-plugins/plugins/vmware/files/runvmware-player-v1
index ee170064..581181a3 100644
--- a/os-plugins/plugins/vmware/files/runvmware-player-v1
+++ b/os-plugins/plugins/vmware/files/runvmware-player-v1
@@ -6,10 +6,10 @@
 #               orwards it into B drive of vmplayer
 #
 # Author(s):    see project authors file
-#               letzte Änderung Volker, 17 .Feb 2008
+#               letzte Änderung mj0, 15/10/2008
 # Copyright:    (c) 2003 - 2008 - RZ Universitaet Freiburg
 #
-# Version:      0.16.611
+# Version:      0.17
 #
 ################################################################################
 
@@ -392,6 +392,7 @@ preferencesheader ()
   pref.eula.0.buildNumber = \"${vmbuild}\"
   pref.eula.1.appName = \"VMware Workstation\"
   pref.eula.1.buildNumber = \"${vmbuild}\"
+  pref.enableAllSharedFolders = "TRUE"
   " \
   >${vmhome}/preferences
 }
@@ -486,13 +487,13 @@ fi
 
 
 ## look for cdrom, dvd and add them to the vm config file
-if [ -L /dev/cdrom ] ; then
-  cdr_1="TRUE"
-fi
-
-if [ -L /dev/cdrom1 ] ; then
-  cdr_2="TRUE"
-fi
+(( cdri=1 ))
+for cdrs in /dev/cdrom*; do
+  if [ -L $cdrs ]; then
+     cdr_${cdri}="TRUE"
+     (( cdri=${cdri}+1 ))
+  fi
+done
 
 
 ## Write all results to logfile
@@ -516,8 +517,8 @@ filecheck
 # VMPlayer Version.
 # strings is the fastest and most secure way, vmplayer -v takes too much time
 # and resources
-# TODO: find a solution which is faster... handeling different installed
-#       vmplversions
+# TODO: fine a faster solution with different installed vmplayer
+#       perhaps via stage1 + /etc/vmware/vmversion
 #vmbuild=$(strings /usr/lib/vmware/bin/vmplayer \
 #    | grep -m 1 "build-"|sed 's/.*build-//')
 if [ -z ${vmbuild} ]; then
@@ -555,6 +556,11 @@ writelog "finished\n"
 if [ $(which vmplayer 2>/dev/null) ]; then writelog "\nStarting VMplayer..."
   # run VMplayer
   writelog "... vmplayer ${vmopt} ${confile}...\n"
+  # start fvwm for player 2+
+  # problems with windows opening in background
+  which fvwm2 && \
+  ( echo "EdgeScroll 0 0" >/tmp/fvwm-$USER
+  fvwm -f /tmp/fvwm-$USER & )
   vmplayer ${vmopt} ${confile} 2>&1 >/dev/null
 else
   writelog "\nNo VMware/VMPlayer found!\n"
diff --git a/os-plugins/plugins/vmware/files/runvmware-player-v2 b/os-plugins/plugins/vmware/files/runvmware-player-v2
index b9391f05..581181a3 100644
--- a/os-plugins/plugins/vmware/files/runvmware-player-v2
+++ b/os-plugins/plugins/vmware/files/runvmware-player-v2
@@ -6,10 +6,10 @@
 #               orwards it into B drive of vmplayer
 #
 # Author(s):    see project authors file
-#               letzte Änderung Volker, 17 .Feb 2008
+#               letzte Änderung mj0, 15/10/2008
 # Copyright:    (c) 2003 - 2008 - RZ Universitaet Freiburg
 #
-# Version:      0.16.611
+# Version:      0.17
 #
 ################################################################################
 
@@ -392,6 +392,7 @@ preferencesheader ()
   pref.eula.0.buildNumber = \"${vmbuild}\"
   pref.eula.1.appName = \"VMware Workstation\"
   pref.eula.1.buildNumber = \"${vmbuild}\"
+  pref.enableAllSharedFolders = "TRUE"
   " \
   >${vmhome}/preferences
 }
@@ -486,13 +487,13 @@ fi
 
 
 ## look for cdrom, dvd and add them to the vm config file
-if [ -L /dev/cdrom ] ; then
-  cdr_1="TRUE"
-fi
-
-if [ -L /dev/cdrom1 ] ; then
-  cdr_2="TRUE"
-fi
+(( cdri=1 ))
+for cdrs in /dev/cdrom*; do
+  if [ -L $cdrs ]; then
+     cdr_${cdri}="TRUE"
+     (( cdri=${cdri}+1 ))
+  fi
+done
 
 
 ## Write all results to logfile
@@ -555,6 +556,11 @@ writelog "finished\n"
 if [ $(which vmplayer 2>/dev/null) ]; then writelog "\nStarting VMplayer..."
   # run VMplayer
   writelog "... vmplayer ${vmopt} ${confile}...\n"
+  # start fvwm for player 2+
+  # problems with windows opening in background
+  which fvwm2 && \
+  ( echo "EdgeScroll 0 0" >/tmp/fvwm-$USER
+  fvwm -f /tmp/fvwm-$USER & )
   vmplayer ${vmopt} ${confile} 2>&1 >/dev/null
 else
   writelog "\nNo VMware/VMPlayer found!\n"
diff --git a/os-plugins/plugins/vmware/files/runvmware-player-v25 b/os-plugins/plugins/vmware/files/runvmware-player-v25
index b9391f05..581181a3 100644
--- a/os-plugins/plugins/vmware/files/runvmware-player-v25
+++ b/os-plugins/plugins/vmware/files/runvmware-player-v25
@@ -6,10 +6,10 @@
 #               orwards it into B drive of vmplayer
 #
 # Author(s):    see project authors file
-#               letzte Änderung Volker, 17 .Feb 2008
+#               letzte Änderung mj0, 15/10/2008
 # Copyright:    (c) 2003 - 2008 - RZ Universitaet Freiburg
 #
-# Version:      0.16.611
+# Version:      0.17
 #
 ################################################################################
 
@@ -392,6 +392,7 @@ preferencesheader ()
   pref.eula.0.buildNumber = \"${vmbuild}\"
   pref.eula.1.appName = \"VMware Workstation\"
   pref.eula.1.buildNumber = \"${vmbuild}\"
+  pref.enableAllSharedFolders = "TRUE"
   " \
   >${vmhome}/preferences
 }
@@ -486,13 +487,13 @@ fi
 
 
 ## look for cdrom, dvd and add them to the vm config file
-if [ -L /dev/cdrom ] ; then
-  cdr_1="TRUE"
-fi
-
-if [ -L /dev/cdrom1 ] ; then
-  cdr_2="TRUE"
-fi
+(( cdri=1 ))
+for cdrs in /dev/cdrom*; do
+  if [ -L $cdrs ]; then
+     cdr_${cdri}="TRUE"
+     (( cdri=${cdri}+1 ))
+  fi
+done
 
 
 ## Write all results to logfile
@@ -555,6 +556,11 @@ writelog "finished\n"
 if [ $(which vmplayer 2>/dev/null) ]; then writelog "\nStarting VMplayer..."
   # run VMplayer
   writelog "... vmplayer ${vmopt} ${confile}...\n"
+  # start fvwm for player 2+
+  # problems with windows opening in background
+  which fvwm2 && \
+  ( echo "EdgeScroll 0 0" >/tmp/fvwm-$USER
+  fvwm -f /tmp/fvwm-$USER & )
   vmplayer ${vmopt} ${confile} 2>&1 >/dev/null
 else
   writelog "\nNo VMware/VMPlayer found!\n"