summaryrefslogtreecommitdiffstats
path: root/remote
diff options
context:
space:
mode:
authorJonathan Bauer2015-04-10 18:22:19 +0200
committerJonathan Bauer2015-04-10 18:22:19 +0200
commitbae6337ef387f0bb63ae1fbdc6bbafa0491e956a (patch)
treea676c24dcff4f192142be5382d68b58a7652c3d8 /remote
parent[vmchooser2] generate sharelw.cfg file [wip] (diff)
parent[vmchooser2] Ugly hack for sharelws.bat to wait 5 sec via ping (diff)
downloadtm-scripts-bae6337ef387f0bb63ae1fbdc6bbafa0491e956a.tar.gz
tm-scripts-bae6337ef387f0bb63ae1fbdc6bbafa0491e956a.tar.xz
tm-scripts-bae6337ef387f0bb63ae1fbdc6bbafa0491e956a.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote')
-rwxr-xr-xremote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt1
-rw-r--r--remote/modules/vmchooser2/data/opt/openslx/vmchooser/data/SHARELWS.BAT40
2 files changed, 41 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 955b9069..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,7 @@ 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"
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