From 39466a0472f46c3e6c4c84a4751d435a3a191eb5 Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Tue, 3 Nov 2009 19:07:51 +0000
Subject: more OpenSLX path optimizations

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3184 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/vmware/files/run-virt.include | 32 +-----------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

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

diff --git a/os-plugins/plugins/vmware/files/run-virt.include b/os-plugins/plugins/vmware/files/run-virt.include
index e3da346e..f2d45b83 100644
--- a/os-plugins/plugins/vmware/files/run-virt.include
+++ b/os-plugins/plugins/vmware/files/run-virt.include
@@ -15,12 +15,6 @@
 #    - component for vmware/player of the vmchooser plugin run-virt.sh
 # -----------------------------------------------------------------------------
 
-# include default directories
-. /etc/opt/openslx/openslx.conf
-# include general configuration from vmchooser
-. ${OPENSLX_DEFAULT_CONFDIR}/plugins/vmchooser/run-virt.include
-
-
 # configuration writer functions
 ################################################################################
 
@@ -239,7 +233,7 @@ vmhome="${HOME}/.vmware"
 logfile=${OPENSLX_DEFAULT_LOGDIR}/run-vmware.${USER}.$$.log
 
 # get several version infos for vmware/player
-. /etc/vmware/slxvmconfig
+. ${OPENSLX_DEFAULT_CONFDIR}/plugins/vmware/vmware.conf
 vmbuild=$buildversion
 vmversion=$version
 
@@ -329,30 +323,6 @@ else
   memhost=$(expr ${totalmem} - ${mem} - ${mem})
 fi
 
-# virtual fd/cd/dvd and drive devices, floppy b: for configuration
-# if $floppy_0 from run-virt.include set then fdtest="TRUE"
-fdtest=
-fdtest=${floppy_0:+"TRUE"}
-# if $fdtest not set floppy0="FALSE", else "TRUE"
-floppy0=${fdtest:-"FALSE"}
-floppy1="TRUE"
-floppy1name="${OPENSLX_DEFAULT_CONFDIR}/plugins/vmchooser/loopimg/fd.img"
-# if $cdrom_0 from run-virt.include set then cdtest="TRUE"
-cdtest=
-cdtest=${cdrom_0:+"TRUE"}
-# if $cdtest not set cdrom0="FALSE", else "TRUE"
-cdrom0=${cdtest:-"FALSE"}
-# if $cdrom_1 from run-virt.include set then cdtest="TRUE"
-cdtest=
-cdtest=${cdrom_1:+"TRUE"}
-# if $cdtest not set cdrom1="FALSE", else "TRUE"
-cdrom1=${cdtest:-"FALSE"}
-# ide is expected default, test for the virtual disk image type should
-# be done while creating the runscripts ...
-ide="TRUE"
-scsi="FALSE"
-hddrv="ide"
-
 # check if ide/scsi and hwver of image
 # read only the first 30 lines to be shure
 imghead=$(head -30 ${diskfile})
-- 
cgit v1.2.3-55-g7522