summaryrefslogtreecommitdiffstats
path: root/os-plugins/plugins/vmchooser/files/run-virt.sh
diff options
context:
space:
mode:
authorMichael Janczyk2009-11-04 19:22:04 +0100
committerMichael Janczyk2009-11-04 19:22:04 +0100
commitf67521c10df1275557058afefcd927b7af85fd17 (patch)
tree82030092f74446db8a7f1323396ab5ec3166e259 /os-plugins/plugins/vmchooser/files/run-virt.sh
parentwm is now opened for all virt-solutions (diff)
downloadcore-f67521c10df1275557058afefcd927b7af85fd17.tar.gz
core-f67521c10df1275557058afefcd927b7af85fd17.tar.xz
core-f67521c10df1275557058afefcd927b7af85fd17.zip
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
Diffstat (limited to 'os-plugins/plugins/vmchooser/files/run-virt.sh')
-rw-r--r--os-plugins/plugins/vmchooser/files/run-virt.sh8
1 files changed, 4 insertions, 4 deletions
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