summaryrefslogtreecommitdiffstats
path: root/src/os-plugins/plugins/vmgrid
diff options
context:
space:
mode:
authorroot2011-01-17 12:10:15 +0100
committerroot2011-01-17 12:10:15 +0100
commite4aedfabe7d586a5633a8be2dcb253b4ac7afca8 (patch)
treeac9a4ddbe756f612dc0a7d4b35e7f23a9afc0b8a /src/os-plugins/plugins/vmgrid
parentremove /proc/bus/usb stuff.. (diff)
downloadcore-e4aedfabe7d586a5633a8be2dcb253b4ac7afca8.tar.gz
core-e4aedfabe7d586a5633a8be2dcb253b4ac7afca8.tar.xz
core-e4aedfabe7d586a5633a8be2dcb253b4ac7afca8.zip
commit of quickfixes on 4.2
Diffstat (limited to 'src/os-plugins/plugins/vmgrid')
-rw-r--r--src/os-plugins/plugins/vmgrid/files/run-vmgrid.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/os-plugins/plugins/vmgrid/files/run-vmgrid.sh b/src/os-plugins/plugins/vmgrid/files/run-vmgrid.sh
index 51cb5dbc..c4a680b3 100644
--- a/src/os-plugins/plugins/vmgrid/files/run-vmgrid.sh
+++ b/src/os-plugins/plugins/vmgrid/files/run-vmgrid.sh
@@ -267,7 +267,7 @@ xmlvirt=$(grep -o 'virtualmachine param=.*"' ${xmlfile} \
if [ -z "${xmlvirt}" ] && [ -n "${additional_config}" ]; then
writelog "No virtual machine parameter defined in ${xmlfile}"
writelog "Trying to guess VM...\c"
- case "$(cat ${additional_config} | tr [A-Z] [a-z])" in
+ case "$(cat ${additional_config} | tr \"[A-Z]\" \"[a-z]\")" in
*config.version*|*virtualhw.version*|*independent-nonpersistent*|*vmdk*)
xmlvirt="vmware"
;;
@@ -282,7 +282,7 @@ if [ -z "${xmlvirt}" ] && [ -n "${additional_config}" ]; then
;;
esac
elif [ -z "${xmlvirt}" ]; then
- case "$(echo ${imgname##*.} | tr [A-Z] [a-z])" in
+ case "$(echo ${imgname##*.} | tr \"[A-Z]\" \"[a-z]\")" in
vmdk)
xmlvirt="vmware"
;;
@@ -308,13 +308,13 @@ fi
# definition of the client system
vmostype=$(grep -io '<os param=.*"' ${xmlfile} | awk -F '"' '{ print $2 }' \
- | tr [A-Z] [a-z])
+ | tr "[A-Z]" "[a-z]")
# definition of the networking the client system is connected to
network_kind=$(grep -io '<network param=.*"' ${xmlfile} \
- | awk -F '"' '{ print $2 }' | tr [A-Z] [a-z])
+ | awk -F '"' '{ print $2 }' | tr "[A-Z]" "[a-z]")
network_card=$(grep -io '<netcard param=.*"' ${xmlfile} \
- | awk -F '"' '{ print $2 }'| tr [A-Z] [a-z])
+ | awk -F '"' '{ print $2 }'| tr "[A-Z]" "[a-z]")
# define redirects
redirects=$(grep -ic '<redirect name=.*"' ${xmlfile})
@@ -361,7 +361,7 @@ mem=$(expr ${totalmem} / 100 \* ${permem} / 4 \* 4)
# define one MAC per guest
macguestpart="00:50:56:${VM_ID}"
machostpart=$(echo ${hostmacaddr} | awk -F ":" '{print $(NF-1)":"$NF}')
-macaddr=$(echo "${macguestpart}:${machostpart}" | tr [a-z] [A-Z])
+macaddr=$(echo "${macguestpart}:${machostpart}" | tr "[a-z]" "[A-Z]")
# ide is expected default, test for the virtual disk image type should
# be done while creating the runscripts ...