diff options
| author | Manuel Schneider | 2014-04-02 17:14:53 +0200 |
|---|---|---|
| committer | Manuel Schneider | 2014-04-02 17:14:53 +0200 |
| commit | 16ea98da2b2229a2b8e82a58b982df796931ce54 (patch) | |
| tree | 454a577a1541704b5f46bc92215665cb5d1e5fa8 /remote/modules/vmchooser/data/opt/openslx/scripts | |
| parent | [beamergui] Small fixed in modesetter. Moved modesetter to login (Xsession.d)... (diff) | |
| parent | [rfs-stage32] Fix logic in setup slx addons: Only check for empty addon list ... (diff) | |
| download | tm-scripts-16ea98da2b2229a2b8e82a58b982df796931ce54.tar.gz tm-scripts-16ea98da2b2229a2b8e82a58b982df796931ce54.tar.xz tm-scripts-16ea98da2b2229a2b8e82a58b982df796931ce54.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/vmchooser/data/opt/openslx/scripts')
| -rwxr-xr-x | remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt | 12 |
1 files changed, 11 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 f9b4aaf1..ec9f906e 100755 --- a/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt +++ b/remote/modules/vmchooser/data/opt/openslx/scripts/vmchooser-run_virt @@ -70,6 +70,15 @@ cleanexit () { exit 129 # No exit code was given :/ } +function rv_clean_string () +{ + if [ "$#" -ge 1 ]; then + echo "$@" | tr '[A-Z]' '[a-z]' | tr -d -c '[a-z0-9]' + else + tr '[A-Z]' '[a-z]' | tr -d -c '[a-z0-9]' + fi +} + trap cleanexit SIGINT SIGTERM # check for important files used @@ -221,6 +230,7 @@ writelog "\t/tmp info:\t\t$(df -h | grep " /tmp$" | awk '{print $2}') \c" writelog "$(grep "/tmp " /proc/mounts | awk '{print $1" "$2" "$3" "$4}')" writelog "\tVM XML dir:\t\t$(dirname "${xmlfile}")" writelog "\tXML file:\t\t${xmlfile}" +writelog "Enable 3D:\t\t${enable3d}" writelog "VM config:" # Name of the virt image @@ -405,7 +415,7 @@ remotedesktopport="590${VM_ID}" # Enable 3D -enable3d=$(grep -i "<enable3d param=.*" ${xmlfile} 2>/dev/null | awk -F '=' '{print $2}' | tr "[A-Z]" "[a-z]") +enable3d=$(grep -i -o "<enable3d param=.*" "${xmlfile}" | awk -F '"' '{print $2}' | rv_clean_string) # Add rw share sharepath="${HOME}/PERSISTENT" |