summaryrefslogtreecommitdiffstats
path: root/remote/modules
diff options
context:
space:
mode:
Diffstat (limited to 'remote/modules')
-rw-r--r--remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc9
1 files changed, 4 insertions, 5 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 ddfbacbb..ee737ed3 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
@@ -10,10 +10,6 @@ dd "if=/dev/zero" "of=${FLOPPYIMG}" count=1440 bs=1024
chmod 0600 "${FLOPPYIMG}"
mkfs.fat "${FLOPPYIMG}" || mkfs.vfat "${FLOPPYIMG}" || mkdosfs "${FLOPPYIMG}"
-# Copy guest configuration (with added information) config.xml to be accessed
-# via virtual floppy
-#mcopy -i "${FLOPPYIMG}" "$xmlfile" "::/config.xml"
-
# Create file with resolution information etc.
. "/opt/openslx/inc/shares"
if [ -z "$SHARE_REMAP_MODE" ]; then
@@ -44,7 +40,6 @@ HIER
# Legacy: HOSTRES.TXT
cat > "${TMPDIR}/HOSTRES.TXT" <<-HIER
${RESOLUTION}
-This file is deprecated! Use openslx.ini
HIER
# Create file for network shares to mount
@@ -69,6 +64,10 @@ fi
# Copy all them files into floppy image
mcopy -i "${FLOPPYIMG}" "${TMPDIR}/openslx.ini" "${TMPDIR}/HOSTRES.TXT" "${SHARES}" "::/"
mcopy -i "${FLOPPYIMG}" "$VMCHOOSER_DIR/data/openslx.exe" "::/"
+# Copy guest configuration (with added information) config.xml to be accessed
+# via virtual floppy
+mcopy -i "${FLOPPYIMG}" "$xmlfile" "::/config.xml"
+
rm -f -- "${SHARES}" "${TMPDIR}/openslx.ini" "${TMPDIR}/HOSTRES.TXT"
unset SHARES VAR NETHOME