From 42afca10fa4df79e7dfd7ddfe4df21df82ac159c Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Sun, 3 Sep 2006 13:59:27 +0000
Subject: VMware environment: loopfile and mount will be placed in /etc/vmware
 now to avoid problems with nfs and unionfs. Cleanups in vmware-prep script.
 Introduced new debug level for script runtime calculation, see DebugLevel for
 further information. Code cleanups in major initramfs scripts, improved /tmp
 handling in hwautocfg and init ... Removed imgsrv variable (from
 machine-setup), just merged with the vmware variable (put the vmware image
 source here ...)

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@352 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 vmware/runvmware |  4 ++--
 vmware/winconfig | 15 +--------------
 2 files changed, 3 insertions(+), 16 deletions(-)

(limited to 'vmware')

diff --git a/vmware/runvmware b/vmware/runvmware
index 65aec286..c6b5d7f7 100755
--- a/vmware/runvmware
+++ b/vmware/runvmware
@@ -193,7 +193,7 @@ cdr_2_name="/dev/cdrom1"
 floppya="FALSE"
 floppyb="FALSE"
 # place for the virtual floppy "B:"
-floppybname="/tmp/${clientip}-fd0.img"
+floppybname="/etc/vmware/loopimg/fd1.img"
 # resolution
 hostres=$(xvidtune -show | grep -ve "^$")
 xres=$(echo "${hostres}" | awk '{print $3}')
@@ -297,7 +297,7 @@ Image options:
         --include <includefile> include code right before program start
 	--displayaliases	aliases you can use with option -a
         --floppya               enable floppy disk
-        --floppyb               use /tmp/loop0 as floppy B,
+        --floppyb               use /etc/vmware/fd-loop as floppy B,
                                 needed for exchanging files w/ VMware
 VMware options:
         --run <program>         specify programm, e.g. vmware, vmplayer, ...
diff --git a/vmware/winconfig b/vmware/winconfig
index 676fe141..84ccf482 100644
--- a/vmware/winconfig
+++ b/vmware/winconfig
@@ -3,19 +3,6 @@
 #
 # create Windows config file
 
-
-# NO LONGER NEEDED !!!!!
-# definition of some resolution variables
-#hostres=$(xvidtune -show | grep -ve "^$")
-#x_param=$(echo "${hostres}" | awk '{print $3}')
-#y_param=$(echo "${hostres}" | awk '{print $7}')
-#resolution="
-#    <resolution_x param=\"${x_param}\">\r
-#    </resolution_x>\r
-#    <resolution_y param=\"${y_param}\">\r
-#    </resolution_y>\r"
-
-
 # VMplayer does not need resolution change
 #if [ `which vmplayer 2>/dev/null` ] && [ -z "${vmrun}" ] \
 #  || [ "${vmrun}" = "vmplayer" ]; then
@@ -34,6 +21,6 @@ echo -e "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r
     </username>
   </eintrag>\r
 </settings>\r" \
-> /tmp/loop0/config.xml
+> /etc/vmware/fd-loop/config.xml
 
 sync
-- 
cgit v1.2.3-55-g7522