From f67521c10df1275557058afefcd927b7af85fd17 Mon Sep 17 00:00:00 2001 From: Michael Janczyk Date: Wed, 4 Nov 2009 18:22:04 +0000 Subject: let vmware-include in vmware path numvcpus now changed even for ver. 2.5 win key works only in preferences git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3201 95ad53e4-c205-0410-b2fa-d234c58c8868 --- os-plugins/plugins/vmchooser/files/run-virt.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'os-plugins/plugins/vmchooser/files/run-virt.sh') diff --git a/os-plugins/plugins/vmchooser/files/run-virt.sh b/os-plugins/plugins/vmchooser/files/run-virt.sh index 308dbb0d..5aefc47e 100644 --- a/os-plugins/plugins/vmchooser/files/run-virt.sh +++ b/os-plugins/plugins/vmchooser/files/run-virt.sh @@ -20,7 +20,8 @@ # include default directories . /etc/opt/openslx/openslx.conf -PLUGINCONFDIR=${OPENSLX_DEFAULT_CONFDIR}/plugins/vmchooser +PLUGINCONFROOT=${OPENSLX_DEFAULT_CONFDIR}/plugins +PLUGINCONFDIR=${PLUGINCONFROOT}/vmchooser # include general configuration from vmchooser . ${PLUGINCONFDIR}/run-virt.include @@ -227,7 +228,6 @@ OpenSLX script for preparing virtual machine environment ... EOL - # Adjust sound volume writelog "Unmuting sound...\c " amixer -q sset Master 80% unmute 2>/dev/null @@ -248,8 +248,8 @@ cp ${xml} ${PLUGINCONFDIR}/fd-loop/config.xml filecheck # Get all virtual machine specific stuff from the respective include file -if [ -e ${PLUGINCONFDIR}/run-${virt_mach}.include ] ; then - . ${PLUGINCONFDIR}/run-${virt_mach}.include +if [ -e ${PLUGINCONFROOT}/${virt_mach}/run-${virt_mach}.include ] ; then + . ${PLUGINCONFROOT}/${virt_mach}/run-${virt_mach}.include # start a windowmanager for easier handling # (expect problems /w windows opening in background /w vmware without wm) for dm in xfwm4 metacity openbox blackbox kwin fvwm2 ; do -- cgit v1.2.3-55-g7522