From 926035c0f0b1a7e8062202229f97f0fd659f14db Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 1 Apr 2014 15:35:03 +0200
Subject: [vmware/vmchooser] Generalize string cleaning function

---
 .../data/opt/openslx/vmchooser/vmware/run-virt.include      | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'remote/modules/vmware/data')

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..d9a47054 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 ()
 {
@@ -466,7 +457,7 @@ esac
 sound="es1371"
 
 # check for 3D configuration setting
-case "$(clean_string "$enable3d")" in
+case "$enable3d" in
 	true|yes)
 		enable3d="TRUE"
 	;;
-- 
cgit v1.2.3-55-g7522


From 1f689573b6fd89d06c6f0e9998276f48ae4b7ade Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 1 Apr 2014 15:38:47 +0200
Subject: [vmware] Support "bridge" and "bridged" as option string for bridged
 mode

---
 .../modules/vmware/data/opt/openslx/vmchooser/vmware/run-virt.include   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'remote/modules/vmware/data')

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 d9a47054..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
@@ -442,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)
-- 
cgit v1.2.3-55-g7522