From afe3daff4f7c5eb6d9935cf1fd10893bf9a0e015 Mon Sep 17 00:00:00 2001
From: Dirk
Date: Thu, 7 Jul 2011 21:18:59 +0200
Subject: More stuff ...

---
 src/os-plugins/plugins/emufe/XX_emufe.sh           | 37 ++++++++++++----------
 .../plugins/emufe/files/run-virt.include           |  4 +--
 2 files changed, 22 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/os-plugins/plugins/emufe/XX_emufe.sh b/src/os-plugins/plugins/emufe/XX_emufe.sh
index abde18dd..57db6394 100644
--- a/src/os-plugins/plugins/emufe/XX_emufe.sh
+++ b/src/os-plugins/plugins/emufe/XX_emufe.sh
@@ -36,26 +36,29 @@ if [ -e /initramfs/plugin-conf/emufe.conf ]; then
     testmkd ${PLUGINCONFDIR}
     cp /mnt/${PLUGINDIR}/run-virt.include ${PLUGINCONFDIR}
     cp /initramfs/plugin-conf/emufe.conf ${PLUGINCONFDIR}
-  fi
 
-  ############################################################################
-  # emulator stuff provisioning: two scenarios
-  # * VM images in /usr/share/emufe - then simply link
-  # * VM images via additional mount (mount source NFS, NBD, ...)
+    # allow certain memory access for SheepShaver emulator
+    echo -e "# added by emufe plugin\nvm.mmap_min_addr = 0" >>/mnt/etc/sysctl.conf
 
-  # get source of emufe image server (get type, server and path)
-  if strinstr "/" "${emufe_imagesrc}" ; then
-    vmimgprot=$(uri_token ${emufe_imagesrc} prot)
-    vmimgserv=$(uri_token ${emufe_imagesrc} server)
-    vmimgpath="$(uri_token ${emufe_imagesrc} path)"
-  fi
-  if [ -n "${vmimgserv}" -a -n ${vmimgpath} -a -n ${vmimgprot} ] ; then
-    mnttarget=${VIRTDIR}/emulation
-    # mount the emufe image source readonly (ro)
-    fsmount ${vmimgprot} ${vmimgserv} ${vmimgpath} ${mnttarget} ro
-  else
-    [ $DEBUGLEVEL -gt 1 ] && error "  * Incomplete information in variable \
+    ############################################################################
+    # emulator stuff provisioning: two scenarios
+    # * VM images in /usr/share/emufe - then simply link
+    # * VM images via additional mount (mount source NFS, NBD, ...)
+
+    # get source of emufe image server (get type, server and path)
+    if strinstr "/" "${emufe_imagesrc}" ; then
+      vmimgprot=$(uri_token ${emufe_imagesrc} prot)
+      vmimgserv=$(uri_token ${emufe_imagesrc} server)
+      vmimgpath="$(uri_token ${emufe_imagesrc} path)"
+    fi
+    if [ -n "${vmimgserv}" -a -n ${vmimgpath} -a -n ${vmimgprot} ] ; then
+      mnttarget=${VIRTDIR}/emulation
+      # mount the emufe image source readonly (ro)
+      fsmount ${vmimgprot} ${vmimgserv} ${vmimgpath} ${mnttarget} ro
+    else
+      [ $DEBUGLEVEL -gt 1 ] && error "  * Incomplete information in variable \
 ${emufe_imagesrc}." nonfatal
+    fi
   fi
 else
   [ $DEBUGLEVEL -gt 0 ] && echo "  * Configuration of 'emufe' plugin failed"
diff --git a/src/os-plugins/plugins/emufe/files/run-virt.include b/src/os-plugins/plugins/emufe/files/run-virt.include
index 8e647b12..27af7aad 100644
--- a/src/os-plugins/plugins/emufe/files/run-virt.include
+++ b/src/os-plugins/plugins/emufe/files/run-virt.include
@@ -67,8 +67,8 @@ case "${emulator}" in
     VIRTCMD="dosbox"
   ;;
   SheepShaver*|sheepshaver*)
-    [ "x${rombios}" != "x" ] && rom="-rom ${xmlpath}${rombios}"
-    VIRTCMDOPTS="${VIRTCMDOPTS} -name ${displayname} ${rom}"
+    [ "x${rombios}" != "x" ] && rom="--rom ${xmlpath}${rombios}"
+    VIRTCMDOPTS="${VIRTCMDOPTS} --name ${displayname} ${rom}"
   ;;
   hatari*|Hatari*)
 
-- 
cgit v1.2.3-55-g7522