defaults changed to full path

winconfig changed to not use res w/ vmplayer
locations not needed?
\r added to old runvmware
new runvmware bigfixes



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

4 files changed, 30 insertions, 54 deletions

diff --git a/vmware/defaults b/vmware/defaults
index 52b57bf5..59700a39 100644
--- a/vmware/defaults
+++ b/vmware/defaults
@@ -3,5 +3,5 @@
 # here you can specify default command line options for runvmware
 # all in one line !!!!
 
---include ${vmtempl}/winconfig --floppyb
+--include /var/lib/vmware/templ/winconfig --floppyb
 
diff --git a/vmware/locations b/vmware/locations
deleted file mode 100644
index 3e17cd53..00000000
--- a/vmware/locations
+++ /dev/null
@@ -1,40 +0,0 @@
-file /etc/vmware/locations
-answer BINDIR /usr/bin
-answer LIBDIR /usr/lib/vmware
-answer DOCDIR /usr/share/doc/vmware
-answer MANDIR /usr/share/man
-answer INITDIR /etc/init.d
-answer INITSCRIPTSDIR /etc/init.d
-file /etc/init.d/vmware 1065542439
-answer EULA_AGREED yes
-answer BUILDR_vmmon no
-answer BUILDR_vmnet yes
-answer NETWORKING yes
-file /dev/vmnet0
-file /dev/vmnet1
-file /dev/vmnet2
-file /dev/vmnet3
-file /dev/vmnet4
-file /dev/vmnet5
-file /dev/vmnet6
-file /dev/vmnet7
-file /dev/vmnet8
-file /dev/vmnet9
-answer VNET_0_INTERFACE eth0
-remove_file /dev/vmnet0
-file /dev/vmnet0
-answer VNET_8_HOSTONLY_HOSTADDR 1.2.3.4
-answer VNET_8_HOSTONLY_NETMASK 255.255.255.0
-remove_file /dev/vmnet8
-file /dev/vmnet8
-answer VNET_8_NAT no
-remove_answer VNET_8_HOSTONLY_HOSTADDR
-answer VNET_8_HOSTONLY_HOSTADDR 1.2.4.1
-remove_answer VNET_8_HOSTONLY_NETMASK
-answer VNET_8_HOSTONLY_NETMASK 255.255.255.0
-directory /etc/vmware/vmnet8
-directory /etc/vmware/vmnet8/nat
-file /etc/vmware/vmnet8/nat/nat.conf 1065542600
-answer ISC_COPYRIGHT_SEEN yes
-answer VNET_1_SAMBA no
-remove_file /etc/vmware/config
diff --git a/vmware/runvmware b/vmware/runvmware
index 6a15d939..d8fe7e6e 100755
--- a/vmware/runvmware
+++ b/vmware/runvmware
@@ -4,10 +4,10 @@
 #               X Stations (v4)
 #
 # Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 18-03-2006
-#               Michael Janczyk <mj0@uni-freiburg.de>, 06-04-2006
+#               Michael Janczyk <mj0@uni-freiburg.de>, 13-04-2006
 # Copyright:    (c) 2003, 2006 - RZ Universitaet Freiburg
 #
-version=pre0.14; last_changes=06-04-06
+version=pre0.14; last_changes=13-04-06
 ################################################################################
 
 
@@ -78,7 +78,7 @@ runvmwareconfheader () {
 
   floppy1.present = \"${floppyb}\"
   floppy1.fileType = \"file\"
-  floppy1.fileName = \"${filename}\"
+  floppy1.fileName = \"${floppybname}\"
   floppy1.startConnected = \"TRUE\"
 
 
@@ -124,6 +124,7 @@ preferencesheader () {
   pref.exchangeSelections = \"TRUE\"
   pref.hotkey.shift = \"TRUE\"
   pref.tip.startup = \"FALSE\"
+  pref.vmplayer.exit.vmAction = \"poweroff\"
   pref.vmplayer.fullscreen.autohide = \"TRUE\"
   pref.vmplayer.webUpdateOnStartup = \"FALSE\"
   prefvmx.defaultVMPath = \"${vmhome}\"
@@ -142,6 +143,9 @@ preferencesheader () {
 
 # declaration of default variables
 
+# first read variables from machine-setup
+. /etc/machine-setup
+
 # hardware variables
 # temporary disk space for logs, etc...
 export tmpdir=/tmp/${USER}
@@ -162,7 +166,7 @@ cdr_2_name="/dev/cdrom2"
 floppya="FALSE"
 floppyb="FALSE"
 # place for the virtual floppy "B:"
-filename=`mount | grep -i "/tmp/${clientip}-fd0.img" | awk '{print $1}'`
+floppybname="/tmp/${clientip}-fd0.img"
 
 
 # VMware variables
@@ -200,7 +204,7 @@ filecheck=
 
 # command line variables
 # start with this this default commmand line options + extra
-defaults=$(grep -v "#.*" ${vmtempl}/ostype)
+defaults=$(grep -v "#.*" ${vmtempl}/defaults)
 # add command line opts to defaults
 # defaults will be overwritten by command line options
 lineopts=( `echo ${defaults} $@` )
@@ -381,7 +385,7 @@ filecheck () {
 
 #### INTERPRET COMMAND LINE OPTIONS ############################################
 # print help if no clo
-if [ $# = "0" ]; then
+if [ ${nofclopt} = "0" ]; then
   help
   exit 0
 fi
@@ -678,11 +682,15 @@ preferencesheader
 runvmwareconfheader
 
 # include file which is given via command line
-. ${include}
+[ -n "${include}" ] && . ${include}
 
 # copy VMware (-Player) bios
 cp ${vmtempl}/nvram.5.0 ${tmpdir}/nvram 2>&1 >/dev/null
 
+# adjust volume
+amixer -q sset Master 28 unmute
+amixer -q sset PCM 28 unmute
+
 
 
 
diff --git a/vmware/winconfig b/vmware/winconfig
index 750dd22c..8ac8d149 100644
--- a/vmware/winconfig
+++ b/vmware/winconfig
@@ -8,6 +8,18 @@
 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
+  resolution=
+fi
 
 # sync is needed to ensure that data is really written to virtual disk
 sync
@@ -15,13 +27,9 @@ echo -e "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r
 <settings>\r
   <eintrag>\r
     <computername param=\"${hostname}\">\r
-    </computername>
-    <resolution_x param=\"${x_param}\">\r
-    </resolution_x>\r
-    <resolution_y param=\"${y_param}\">\r
-    </resolution_y>\r
+    </computername>\r
     <username param=\"${USER}\">\r
-    </username>\r
+    </username>\r${resolution}
   </eintrag>\r
 </settings>\r" \
 > /media/loop0/config.xml