From 74ec9bad5b9c5f3f68e84188043103f2deeb2347 Mon Sep 17 00:00:00 2001
From: Dirk
Date: Thu, 7 Jul 2011 20:39:19 +0200
Subject: ...

---
 src/os-plugins/plugins/emufe/XX_emufe.sh            |  2 +-
 src/os-plugins/plugins/emufe/files/run-virt.include | 12 +++++++++---
 src/os-plugins/plugins/vmchooser/files/run-virt.sh  |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'src/os-plugins')

diff --git a/src/os-plugins/plugins/emufe/XX_emufe.sh b/src/os-plugins/plugins/emufe/XX_emufe.sh
index 22dabdf5..abde18dd 100644
--- a/src/os-plugins/plugins/emufe/XX_emufe.sh
+++ b/src/os-plugins/plugins/emufe/XX_emufe.sh
@@ -35,7 +35,7 @@ if [ -e /initramfs/plugin-conf/emufe.conf ]; then
     # copy virtualization include files and emufe.conf to config dir
     testmkd ${PLUGINCONFDIR}
     cp /mnt/${PLUGINDIR}/run-virt.include ${PLUGINCONFDIR}
-    cp ${CONFFILE} ${PLUGINCONFDIR}
+    cp /initramfs/plugin-conf/emufe.conf ${PLUGINCONFDIR}
   fi
 
   ############################################################################
diff --git a/src/os-plugins/plugins/emufe/files/run-virt.include b/src/os-plugins/plugins/emufe/files/run-virt.include
index e3fbfb7f..8e647b12 100644
--- a/src/os-plugins/plugins/emufe/files/run-virt.include
+++ b/src/os-plugins/plugins/emufe/files/run-virt.include
@@ -36,11 +36,11 @@ PLUGINDIRQK=${OPENSLX_DEFAULT_DIR}/plugin-repo/${self}
 # create TMPDIR for all users
 mkdir -m 1777 /tmp/${self} 2>/dev/null
 # TMPDIR
-TMPDIR="/tmp/${self}/${USER}/${VM_ID}"
+TMPDIR="/tmp/${self}/${USER}"
 # define dirs and files which can be removed after exit, be carefull!
 RMDIRS="${TMPDIR}"
 rm -rf ${RMDIRS} 2>/dev/null
-mkdir -m 1777 -p ${QKTMPDIR} 2>/dev/null
+mkdir -m 1777 -p ${TMPDIR} 2>/dev/null
 # vmpath is the path to the emulator/original system image
 diskfile=${vmpath}
 
@@ -58,7 +58,13 @@ VIRTCMD="${emulator}"
 case "${emulator}" in
   dosbox*|Dosbox*)
     tar -xpzf ${diskfile} -C "${TMPDIR}"
-    VIRTCMDOPTS="${VIRTCMDOPTS} ${TMPDIR}"
+    emudir=$(ls ${TMPDIR})
+    [ $(echo ${filenumber}|wc|awk '{print $2}') -eq 1 ] && \
+      TMPDIR=${TMPDIR}/${emudir}
+    echo "# empty" > ${TMPDIR}/dosbox.conf
+    VIRTCMDOPTS="${emulator#*dosbox}"
+    VIRTCMDOPTS="${VIRTCMDOPTS} -conf ${TMPDIR}/dosbox.conf -fullscreen"
+    VIRTCMD="dosbox"
   ;;
   SheepShaver*|sheepshaver*)
     [ "x${rombios}" != "x" ] && rom="-rom ${xmlpath}${rombios}"
diff --git a/src/os-plugins/plugins/vmchooser/files/run-virt.sh b/src/os-plugins/plugins/vmchooser/files/run-virt.sh
index e38c0f19..154714c6 100644
--- a/src/os-plugins/plugins/vmchooser/files/run-virt.sh
+++ b/src/os-plugins/plugins/vmchooser/files/run-virt.sh
@@ -214,7 +214,7 @@ xmlvirt=$(grep -o 'virtualmachine param=.*"' ${xmlfile} \
 # choose the proper virtualization/emulator plugin
 [ "x${xmlvirt}" != "x" -a "x${xmlvirt}" != "xqemukvm" -a \
   "x${xmlvirt}" != "xvirtualbox" -a "x${xmlvirt}" != "xvmware" ] && \
-  xmlvirt="emulator"
+  xmlvirt="emufe"
 
 # make a guess from the filename extension if ${xmlvirt} is empty
 # (not set within the XML file)
-- 
cgit v1.2.3-55-g7522