Merge branch 'master' of openslx.org:openslx/core

4 files changed, 26 insertions, 8 deletions

diff --git a/src/os-plugins/plugins/emufe/files/run-virt.include b/src/os-plugins/plugins/emufe/files/run-virt.include
index 567bc406..d5047daf 100644
--- a/src/os-plugins/plugins/emufe/files/run-virt.include
+++ b/src/os-plugins/plugins/emufe/files/run-virt.include
@@ -109,10 +109,13 @@ case "${emulator}" in
     else
       echo "problem"
     fi
+    cp ${diskfile} ${TMPDIR}
     USERCMDOPTS="$(echo "${emulator}" | tr "A-Z" "a-z")"
     USERCMDOPTS="${USERCMDOPTS#*hatari}"
-    VIRTCMDOPTS="${VIRTCMDOPTS} ${rom} --memsize 14 --confirm-quite false"
-    VIRTCMDOPTS="${VIRTCMDOPTS} -d ${HOME} ${USERCMDOPTS}"
+    VIRTCMDOPTS="${VIRTCMDOPTS} ${rom} --memsize 14 --confirm-quit false --monitor vga"
+    # if fullscreen use -f option
+    VIRTCMDOPTS="${VIRTCMDOPTS} --vdi true --vdi-width 1024 --vdi-height 768"
+    VIRTCMDOPTS="${VIRTCMDOPTS} -d ${HOME} --acsi ${TMPDIR}/${imgname} ${USERCMDOPTS}"
     VIRTCMD="hatari"
   ;;
   *mess*)
@@ -125,6 +128,21 @@ case "${emulator}" in
     VIRTCMDOPTS="${VIRTCMDOPTS} -s floppy0=${diskfile}"
   ;;
   *qemu*)
+    # disable kvm for a range of older operating systems
+    case "${vmostype}" in
+      beos*)
+        VIRTCMDOPTS="${VIRTCMDOPTS} -no-kvm -m 256"
+      ;;
+      win3*|win*3*|Win*3*)
+        VIRTCMDOPTS="${VIRTCMDOPTS} -no-kvm -m 32"
+      ;;
+      win95*|Win*95)
+        VIRTCMDOPTS="${VIRTCMDOPTS} -no-kvm -m 96"
+      ;;
+      win*)
+        VIRTCMDOPTS="${VIRTCMDOPTS} -no-kvm -m 256"
+      ;;
+    esac
     [ "x${rombios}" != "x" ] && rom="-bios ${imgpath}/${rombios}"
     VIRTCMDOPTS="${VIRTCMDOPTS} ${rom} -name \"${displayname}\" -snapshot ${diskfile}"
   ;;
diff --git a/src/os-plugins/plugins/qemukvm/files/run-virt.include b/src/os-plugins/plugins/qemukvm/files/run-virt.include
index 728801c1..64f2b3e1 100644
--- a/src/os-plugins/plugins/qemukvm/files/run-virt.include
+++ b/src/os-plugins/plugins/qemukvm/files/run-virt.include
@@ -54,7 +54,7 @@ fi
 
 # disable kvm for a range of older operating systems
 case "${vmostype}" in
-  beos*|win*3*|win*9*)
+  beos*)
     VIRTCMDOPTS="${VIRTCMDOPTS} -no-kvm"
     if [ "${totalmem}" -ge "1000" ]; then
       forcemem=512
@@ -64,12 +64,12 @@ case "${vmostype}" in
     # add some OS specific options if required
     emu="qemu"
   ;;
-  win*3*)
+  win3*|win*3*|Win*3*)
     VIRTCMDOPTS="${VIRTCMDOPTS} -no-kvm"
     forcemem=32
     emu="qemu"
   ;;
-  win*95)
+  win95*|Win*95)
     VIRTCMDOPTS="${VIRTCMDOPTS} -no-kvm"
     forcemem=96
     emu="qemu"
diff --git a/src/os-plugins/plugins/vmchooser/files/run-virt.sh b/src/os-plugins/plugins/vmchooser/files/run-virt.sh
index bf62b404..d62a13ae 100644
--- a/src/os-plugins/plugins/vmchooser/files/run-virt.sh
+++ b/src/os-plugins/plugins/vmchooser/files/run-virt.sh
@@ -248,15 +248,15 @@ elif [ -z "${xmlvirt}" ]; then
       xmlvirt="qemukvm"
     ;;
     *)
-      xmlvirt="emulator"
+      xmlvirt="emufe"
     ;;
   esac
   writelog "result:\t${xmlvirt}"
 fi
 
 # Definition of the client system
-vmostype=$(grep -io '<os param=.*"' ${xmlfile} | awk -F '"' '{ print $2 }' \
-           | tr "[A-Z]" "[a-z]")
+vmostype=$(grep -io '<os param=.*"' ${xmlfile} | awk -F '"' '{ print $2 }' |\
+  tr "[A-Z]" "[a-z]")
 
 # Definition of the networking the client system is connected to
 network_kind=$(grep -io '<network param=.*"' ${xmlfile} \
diff --git a/src/os-plugins/plugins/vmchooser/files/vmchooser b/src/os-plugins/plugins/vmchooser/files/vmchooser
index 69970233..c4ec59e2 100755
--- a/src/os-plugins/plugins/vmchooser/files/vmchooser
+++ b/src/os-plugins/plugins/vmchooser/files/vmchooser