diff options
| author | Simon Rettberg | 2015-05-15 17:36:29 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-05-15 17:36:29 +0200 |
| commit | 9fff0a99fa0031c5b70a43b5eea93681ca0f70be (patch) | |
| tree | c9ec0dcd587b003d3be63905245e68f102397465 /remote/modules/vmchooser2/data | |
| parent | Compatibility improvements with ldadp and windows servers in mount scripts (diff) | |
| parent | [vbox] CAUTION: COMPATIBILITY BREAK to V3! virtualbox runs now, needs further (diff) | |
| download | tm-scripts-9fff0a99fa0031c5b70a43b5eea93681ca0f70be.tar.gz tm-scripts-9fff0a99fa0031c5b70a43b5eea93681ca0f70be.tar.xz tm-scripts-9fff0a99fa0031c5b70a43b5eea93681ca0f70be.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/vmchooser2/data')
| -rwxr-xr-x | remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt | 8 | ||||
| -rw-r--r-- | remote/modules/vmchooser2/data/opt/openslx/vmchooser/data/SHARELWS.BAT | 40 |
2 files changed, 48 insertions, 0 deletions
diff --git a/remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt index d41bf564..07f40e0f 100755 --- a/remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt +++ b/remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt @@ -531,6 +531,14 @@ cp "$xmlfile" "$VMCHOOSER_DIR/fd-loop/config.xml" xrandr | grep -o -E 'connected\s*(primary)?\s*[0-9]+x[0-9]+\+0\+0' | grep -o -E '[0-9]+x[0-9]+' | head -n 1 > "$VMCHOOSER_DIR/fd-loop/hostres.txt" # Add our magic openslx binary that sets the correct guest resolution cp "$VMCHOOSER_DIR/data/openslx.exe" "$VMCHOOSER_DIR/fd-loop/" +cp "$VMCHOOSER_DIR/data/SHARELWS.BAT" "$VMCHOOSER_DIR/fd-loop/" +rm "$VMCHOOSER_DIR/fd-loop/SHARELW.CFG" +for SHARE in $(grep -o -E '^SLX_SHARE_.*_PATH' /opt/openslx/config); do + eval "echo -n \$${SHARE} | /opt/openslx/bin/tr '/' '\' " >> "$VMCHOOSER_DIR/fd-loop/SHARELW.CFG" + eval echo -n " \$${SHARE%PATH}AUTH_PASS /user:\$${SHARE%PATH}AUTH_USER" >> "$VMCHOOSER_DIR/fd-loop/SHARELW.CFG" + echo -e '\r\n' >> "$VMCHOOSER_DIR/fd-loop/SHARELW.CFG" +done + # Try to use dnbd3 to access the image unset vm_diskfile diff --git a/remote/modules/vmchooser2/data/opt/openslx/vmchooser/data/SHARELWS.BAT b/remote/modules/vmchooser2/data/opt/openslx/vmchooser/data/SHARELWS.BAT new file mode 100644 index 00000000..01838705 --- /dev/null +++ b/remote/modules/vmchooser2/data/opt/openslx/vmchooser/data/SHARELWS.BAT @@ -0,0 +1,40 @@ +@echo off + +setlocal EnableDelayedExpansion + +rem Kein sleep oder timeout bis Win7, also einen +rem haesslichen Hack (Zeitverz. ca. 5 sec) +rem Sinn der Verzoegerung: Mitunter (1/3) wird +rem sonst das erste Netzlaufwerk nicht eingehaengt + +@ping -n 5 localhost> nul + +rem Konfigdatei auslesen und erstmal in Feld: +set n=0 +for /f %%i in (b:\sharelw.cfg) do ( + set array[!n!]=%%i + set /A n+=1 +) + +rem Aufruf für net use erzeugen: +set "i=0" +for %%b in (K L M N O P Q R S T U V W X Y Z) do ( + if defined array[!i!] ( + call set aufruf[!i!]=%%b: %%array[!i!]%% + set /A "i+=1" + ) else ( + goto :Schleifenende + ) +) +:Schleifenende + +rem net use-Aufrufe +set "i=0" +:Ausdrucken +if defined aufruf[!i!] ( + call net use %%aufruf[!i!]%% + set /a "i+=1" + GOTO :Ausdrucken +) + +exit /B |