diff options
| author | Christian Rößler | 2016-04-11 16:33:49 +0200 |
|---|---|---|
| committer | Christian Rößler | 2016-04-11 16:33:49 +0200 |
| commit | 6cd52fa29ded8ba658bc94c47781e2beb03a1b5e (patch) | |
| tree | 095837f3c3e87d63936f0cbfa99ee18e2bf4f7aa | |
| parent | [config-fr] PVS: Three more manager IPS, more room corr. (-114 needs to (diff) | |
| parent | [run-virt] Add username field to openslx.ini (diff) | |
| download | tm-scripts-6cd52fa29ded8ba658bc94c47781e2beb03a1b5e.tar.gz tm-scripts-6cd52fa29ded8ba658bc94c47781e2beb03a1b5e.tar.xz tm-scripts-6cd52fa29ded8ba658bc94c47781e2beb03a1b5e.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
| -rw-r--r-- | remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc | 47 |
1 files changed, 26 insertions, 21 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..9d46f78f 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 @@ -26,25 +22,9 @@ fi 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}/openslx.ini" <<-HIER -[openslx] -resolution=${RESOLUTION} -createMissingRemap=${SHARE_CREATE_MISSING_REMAP} -remapMode=${SHARE_REMAP_MODE_INI} -homeDrive=${SHARE_HOME_DRIVE} - -[remap] -documents=${SHARE_DOCUMENTS} -downloads=${SHARE_DOWNLOADS} -desktop=${SHARE_DESKTOP} -media=${SHARE_MEDIA} -other=${SHARE_OTHER} -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 @@ -66,9 +46,34 @@ else done fi +# Info file +UNAME= +[ -s "${HOME}/.account" ] && UNAME=$(cat "${HOME}/.account") +[ -z "${UNAME}" ] && UNAME=$(whoami) +cat > "${TMPDIR}/openslx.ini" <<-HIER +[openslx] +username=${UNAME} +resolution=${RESOLUTION} +createMissingRemap=${SHARE_CREATE_MISSING_REMAP} +remapMode=${SHARE_REMAP_MODE_INI} +homeDrive=${SHARE_HOME_DRIVE} + +[remap] +documents=${SHARE_DOCUMENTS} +downloads=${SHARE_DOWNLOADS} +desktop=${SHARE_DESKTOP} +media=${SHARE_MEDIA} +other=${SHARE_OTHER} +HIER + + # 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 +unset SHARES VAR NETHOME UNAME |