summaryrefslogtreecommitdiffstats
path: root/remote/modules/vmware/data
diff options
context:
space:
mode:
Diffstat (limited to 'remote/modules/vmware/data')
-rw-r--r--remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc74
1 files changed, 37 insertions, 37 deletions
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
index fff387f2..34201b48 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc
@@ -17,8 +17,7 @@ writelog "Guest MAC: $macaddr"
echo 'ethernet0.addressType = "static"' >> "$TMPDIR/$IMGUUID"
echo 'ethernet0.address = "'"${macaddr}"'"' >> "$TMPDIR/$IMGUUID"
-# DVD, CDROM
-# XXX: For now it's save to assume ide channel 1 is free, as we support only one HDD, and it it's IDE, it's on channel 0
+# Massenspeicher: DVD, CDROM
cat >> "$TMPDIR/$IMGUUID" <<-HEREEND
ide1:0.present = "$cdrom0"
ide1:0.autodetect = "TRUE"
@@ -30,7 +29,7 @@ ide1:1.fileName = "auto detect"
ide1:1.deviceType = "cdrom-raw"
HEREEND
-# Floppies:
+# Floppies:
cat >> "$TMPDIR/$IMGUUID" <<-HEREEND
floppy0.present = "$floppy0"
floppy0.startConnected = "FALSE"
@@ -42,30 +41,6 @@ floppy1.fileType = "file"
floppy1.fileName = "$floppy1name"
HEREEND
-# Shared Folders
-cat >> "$TMPDIR/$IMGUUID" <<-HEREEND
-$ENABLE_SHARE
-sharedFolder0.present = "$shfolders"
-sharedFolder0.enabled = "$shfolders"
-sharedFolder0.expiration = "never"
-sharedFolder0.guestName = "$homesharename"
-sharedFolder0.hostPath = "$homesharepath"
-sharedFolder0.readAccess = "TRUE"
-sharedFolder0.writeAccess = "TRUE"
-sharedFolder1.present = "$shfolders"
-sharedFolder1.enabled = "$shfolders"
-sharedFolder1.expiration = "never"
-sharedFolder1.guestName = "$commonsharename"
-sharedFolder1.hostPath = "$commonsharepath"
-sharedFolder1.readAccess = "TRUE"
-sharedFolder1.writeAccess = "FALSE"
-sharedFolder.maxNum = "2"
-isolation.tools.hgfs.disable = "FALSE"
-hgfs.mapRootShare = "TRUE"
-hgfs.linkRootShare = "TRUE"
-HEREEND
-
-
writelog "numvcpus = ${cpu_cores} - maxvcpus=${real_core_count}"
# RAM, CPUs
@@ -84,21 +59,46 @@ usb.present = "TRUE"
usb.generic.autoconnect = "TRUE"
HEREEND
-# Serial, Parallel: Empty, nothing is being currently set. TODO later.
+# shared folders
+cat >> "$TMPDIR/$IMGUUID" <<-HEREEND
+$ENABLE_SHARE
+sharedFolder0.present = "$shfolders"
+sharedFolder0.enabled = "$shfolders"
+sharedFolder0.expiration = "never"
+sharedFolder0.guestName = "$homesharename"
+sharedFolder0.hostPath = "$homesharepath"
+sharedFolder0.readAccess = "TRUE"
+sharedFolder0.writeAccess = "TRUE"
+sharedFolder1.present = "$shfolders"
+sharedFolder1.enabled = "$shfolders"
+sharedFolder1.expiration = "never"
+sharedFolder1.guestName = "$commonsharename"
+sharedFolder1.hostPath = "$commonsharepath"
+sharedFolder1.readAccess = "TRUE"
+sharedFolder1.writeAccess = "TRUE"
+sharedFolder.maxNum = "2"
+HEREEND
-# Graphics, GPU: 3D will be forced if FORCE3D is set.
+# Isolation tools: settings
+# It should be verified whether and when entries necessary
+cat >> "$TMPDIR/$IMGUUID" <<-HEREEND
+isolation.tools.hgfs.disable = "FALSE"
+isolation.tools.dnd.disable = "FALSE"
+isolation.tools.copy.enable = "TRUE"
+isolation.tools.paste.enabled = "TRUE"
+HEREEND
+
+# Seriell, Parallel: Empty, nothing is being currently set. TODO later.
+
+# Graphics, GPU: 3D will be activated if FORCE3D is set.
# Force3D is set in set_hardware.inc if SLX_VMWARE_3D is set in config.
if [ -n "$FORCE3D" ]; then
- writelog "FORCE3D set - overriding 3D in vmx file."
+ writelog "FORCE3D set - enabling 3D in vmx file."
echo 'mks.gl.allowBlacklistedDrivers = "TRUE"' >> "$TMPDIR/$IMGUUID"
else
- writelog "FORCE3D not set - 3D will only work if GPU/driver is whitelisted by vmware."
+ writelog "FORCE3D not set - not enabling 3D in vmx file."
fi
-# Disable DPI scaling information passing via vmware tools
-sed -i '/^gui.applyHostDisplayScaling/d' "$TMPDIR/$IMGUUID"
-echo 'gui.applyHostDisplayScalingToGuest = "FALSE"' >> "$TMPDIR/$IMGUUID"
-
# rausziehen: Hardwareversion
# hwver=$(echo "${imghead}" | grep -m1 -ia "ddb.virtualHWVersion" | awk -F '"' '{print $2}')
# writelog "hwver: $hwver"
@@ -107,12 +107,12 @@ echo 'gui.applyHostDisplayScalingToGuest = "FALSE"' >> "$TMPDIR/$IMGUUID"
# rausziehen: GuestOS
-# Killing duplicate lines (output much nicer than sort -u):
+# Killing duplicate lines (output much nicer as sort -u):
awk '!a[$0]++' "${TMPDIR}/${IMGUUID}" > "${TMPDIR}/${IMGUUID}.tmp" && mv "${TMPDIR}/${IMGUUID}.tmp" "${TMPDIR}/${IMGUUID}"
# At last_ Let's copy it to $confdir/run-vmware.conf
cp -p "$TMPDIR/$IMGUUID" "$conffile" && writelog "Copied TMPDIR/IMGUUID ${TMPDIR}/${IMGUUID} to conffile ${conffile}" || \
- ( writelog "Could not copy TMPDIR/IMGUUID -$TMPDIR/$IMGUUID- to conffile ${conffile}!"; cleanexit 1 )
+ ( writelog "Could not copy TMPDIR/IMGUUID -$TMPDIR/$IMGUUID- to conffile ${conffile}!"; cleanexit 1 )
# TODO: Move this to cleanexit.
# rm -f "$TMPDIR/$IMGUUID" || writelog "Could not delete $TMPDIR/$IMGUUID."