diff options
| author | Christian Rößler | 2014-05-05 15:16:46 +0200 |
|---|---|---|
| committer | Christian Rößler | 2014-05-05 15:16:46 +0200 |
| commit | 6986152c15a18b0ab083f5e4c965bf91f55725f3 (patch) | |
| tree | f54c2c424fb55c4969fe1bab797d4cc9a9f3d015 /remote/modules | |
| parent | [vbox] addon-init: addgroup demo->vboxusers will be done by PAM now (diff) | |
| parent | [vmchooser] fix regex for HOSTRES.TXT generation (diff) | |
| download | tm-scripts-6986152c15a18b0ab083f5e4c965bf91f55725f3.tar.gz tm-scripts-6986152c15a18b0ab083f5e4c965bf91f55725f3.tar.xz tm-scripts-6986152c15a18b0ab083f5e4c965bf91f55725f3.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules')
| -rwxr-xr-x | remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt index 18df10d3..36e06e7e 100755 --- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt +++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt @@ -481,7 +481,7 @@ PID_LPD="$!" # via virtual floppy cp "$xmlfile" "$VMCHOOSER_DIR/fd-loop/config.xml" # Add another file with resolution information -xrandr | grep -o -E 'connected\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" +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/" |