diff options
| author | Simon Rettberg | 2016-04-08 15:17:19 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-04-08 15:17:19 +0200 |
| commit | 1fb7585a5f7e3f27b97fd481554bff328267ea07 (patch) | |
| tree | f9d1373c24023ea83debb9b99ac9d1dc5c7f8f7e | |
| parent | [config-fr] PVS: room -101 now corrected (diff) | |
| download | tm-scripts-1fb7585a5f7e3f27b97fd481554bff328267ea07.tar.gz tm-scripts-1fb7585a5f7e3f27b97fd481554bff328267ea07.tar.xz tm-scripts-1fb7585a5f7e3f27b97fd481554bff328267ea07.zip | |
[run-virt] Revert config.xml and hostres.txt for backwards compatibility
| -rw-r--r-- | remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc | 9 |
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 |