diff options
| author | Manuel Schneider | 2014-09-30 15:01:05 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2014-09-30 15:01:05 +0200 |
| commit | 930cd28a80eaaf66d499efc72a5f938d6b9d5e6d (patch) | |
| tree | 4056c08a5fa07e117ca05eac223a0e6e2445b76c /remote/modules/vmchooser2 | |
| parent | [cups] Do not accept color jobs on BW printers (diff) | |
| parent | [alsa] Disable alsa config generation - breaks vmware mic input (diff) | |
| download | tm-scripts-930cd28a80eaaf66d499efc72a5f938d6b9d5e6d.tar.gz tm-scripts-930cd28a80eaaf66d499efc72a5f938d6b9d5e6d.tar.xz tm-scripts-930cd28a80eaaf66d499efc72a5f938d6b9d5e6d.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/vmchooser2')
| -rwxr-xr-x | remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt | 3 |
1 files changed, 2 insertions, 1 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 59cddfed..231ef6fe 100755 --- a/remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt +++ b/remote/modules/vmchooser2/data/opt/openslx/scripts/vmchooser-run_virt @@ -446,6 +446,7 @@ amixer -q sset Front "$VOL" unmute 2>/dev/null amixer -q sset Speaker "$VOL" unmute 2>/dev/null # annoying built-in speaker amixer -q sset 'Front Mic' "$VOL" unmute 2>/dev/null # to be checked if Mic is actually activated amixer -q sset 'Rear Mic' "$VOL" unmute 2>/dev/null # =""= +amixer -q sset 'Capture' "$VOL" cap unmute 2>/dev/null # to be checked if Mic is actually activated amixer -q -c pcsp sset Master "0%" mute 2>/dev/null # fix random static noise when starting vmplayer when module snd_pcsp (not pcspkr) is loaded # Start printer daemon @@ -482,7 +483,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/" |