diff options
| -rw-r--r-- | os-plugins/plugins/vmchooser/files/run-virt.sh | 8 | ||||
| -rw-r--r-- | os-plugins/plugins/vmware/XX_vmware.sh | 3 | ||||
| -rw-r--r-- | os-plugins/plugins/vmware/files/run-virt.include | 7 |
3 files changed, 8 insertions, 10 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 diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh index f880b5aa..b31df648 100644 --- a/os-plugins/plugins/vmware/XX_vmware.sh +++ b/os-plugins/plugins/vmware/XX_vmware.sh @@ -198,8 +198,7 @@ prefvmx.useRecommendedLockedMemSize = "TRUE"' | sed -e "s/^ *//" \ # copy version depending files - the vmchooser expects for every virtua- # lization plugin a file named after it (here run-vmware.include) - cp ${PLUGINDIR}/run-virt.include \ - ${PLUGINCONFDIR}/../vmchooser/run-vmware.include + cp ${PLUGINDIR}/run-virt.include ${PLUGINCONFDIR}/run-vmware.include # copy version depending files cp ${PLUGINDIR}/${vmware_kind}/vmplayer ${BINDIR}/vmplayer if [ -e ${PLUGINDIR}/${vmware_kind}/vmware ]; then diff --git a/os-plugins/plugins/vmware/files/run-virt.include b/os-plugins/plugins/vmware/files/run-virt.include index 804c2f99..641f03ec 100644 --- a/os-plugins/plugins/vmware/files/run-virt.include +++ b/os-plugins/plugins/vmware/files/run-virt.include @@ -42,17 +42,16 @@ sharedFolder.option = \"alwaysEnabled\"" >>${conffile} esac case "$vmversion" in 2.5|3.*|6.5|7.*) + numvcpus="${cpu_cores}" cap3d="TRUE" # helper var for loging output echo " # version specific stuff - ver. 2.5|3.*|6.5|7.* -pref.hotkey.gui = \"true\" ehci.present = \"TRUE\" mks.enable3d = \"${enable3d}\"" >>${conffile} ;; esac case "$vmversion" in - 3.*|7.*) - numvcpus="${cpu_cores}" + 3.*|7.*) # svga_autodetect="FALSE" # if defined manual, see below echo " # version specific stuff - ver. 3.*|7.* @@ -191,7 +190,7 @@ prefvmx.mru.config = \"${conffile}:\" pref.hotkey.control = \"true\" pref.hotkey.alt = \"true\" pref.hotkey.shift = \"true\" -# pref.hotkey.gui = \"true\" # in run-vmware.conf now +pref.hotkey.gui = \"true\" gui.restricted = \"true\" # fullscreen/mouse/keyboard |