[run-virt] More progress on openslx.exe

1 files changed, 22 insertions, 4 deletions

diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc
index d1343700..2fdebf4c 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc
@@ -14,9 +14,26 @@ mkfs.fat "${FLOPPYIMG}" || mkfs.vfat "${FLOPPYIMG}" || mkdosfs "${FLOPPYIMG}"
 # via virtual floppy
 #mcopy -i "${FLOPPYIMG}" "$xmlfile" "::/config.xml"
 
-# Create file with resolution information
-xrandr | grep -o -E 'connected\s*(primary)?\s*[0-9]+x[0-9]+\+0\+0' \
-	| grep -o -E -m1 '[0-9]+x[0-9]+' > "${TMPDIR}/hostres.txt"
+# Create file with resolution information etc.
+. "/opt/openslx/inc/shares"
+[ -z "$SHARE_REMAP_MODE" ] && SHARE_REMAP_MODE="1"
+[ -z "$SHARE_CREATE_MISSING_REMAP" ] && SHARE_CREATE_MISSING_REMAP="1"
+RESOLUTION=$(xrandr | grep -o -E 'connected\s*(primary)?\s*[0-9]+x[0-9]+\+0\+0' \
+	| grep -o -E -m1 '[0-9]+x[0-9]+')
+
+cat > "${TMPDIR}/geraffel.ini" <<-HIER
+[openslx]
+resolution=${RESOLUTION}
+createMissingRemap=${SHARE_CREATE_MISSING_REMAP}
+remapMode=${SHARE_REMAP_MODE}
+
+[remap]
+documents=${SHARE_DOCUMENTS}
+downloads=${SHARE_DOWNLOADS}
+desktop=${SHARE_DESKTOP}
+media=${SHARE_MEDIA}
+other=${SHARE_OTHER}
+HIER
 
 # Create file for network shares to mount
 SHARES="${TMPDIR}/shares.dat"
@@ -36,8 +53,9 @@ if pwdaemon --query "${TMPHOME}/.pwsocket" > "${SHARES}"; then
 fi
 
 # Copy all them files into floppy image
-mcopy -i "${FLOPPYIMG}" "${TMPDIR}/hostres.txt" "::/"
+mcopy -i "${FLOPPYIMG}" "${TMPDIR}/geraffel.ini" "::/"
 mcopy -i "${FLOPPYIMG}" "$VMCHOOSER_DIR/data/openslx.exe" "::/"
 mcopy -i "${FLOPPYIMG}" "${SHARES}" "::/"
+rm -f -- "${SHARES}"
 unset SHARES VAR NETHOME