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/vmware | |
| 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/vmware')
| -rw-r--r-- | remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include index 3933287b..be2990a3 100644 --- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include +++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include @@ -18,16 +18,7 @@ ### configuration writer functions ################################################################################ -function clean_string () -{ - if [ "$#" -ge 1 ]; then - echo "$@" | tr '[A-Z]' '[a-z]' | tr -d '\t _./' - else - cat - | tr '[A-Z]' '[a-z]' | tr -d '\t _./' - fi -} - -vmostype=$(clean_string "$vmostype") +vmostype=$(rv_clean_string "$vmostype") runvmwareconfheader () { @@ -451,7 +442,7 @@ fi # use different network card (default e1000, vlance, vmxnet) hostdev="/dev/vmnet1" case "${network_kind}" in - bridge) + bridge|bridged) hostdev="/dev/vmnet0" ;; nat) @@ -466,7 +457,7 @@ esac sound="es1371" # check for 3D configuration setting -case "$(clean_string "$enable3d")" in +case "$enable3d" in true|yes) enable3d="TRUE" ;; |