summaryrefslogtreecommitdiffstats
path: root/src/os-plugins/plugins/vmchooser/files/run-virt.sh
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/vmchooser/files/run-virt.sh
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/vmchooser/files/run-virt.sh')
-rw-r--r--src/os-plugins/plugins/vmchooser/files/run-virt.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/os-plugins/plugins/vmchooser/files/run-virt.sh b/src/os-plugins/plugins/vmchooser/files/run-virt.sh
index aff0294c..4ba95db3 100644
--- a/src/os-plugins/plugins/vmchooser/files/run-virt.sh
+++ b/src/os-plugins/plugins/vmchooser/files/run-virt.sh
@@ -217,7 +217,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"
;;
@@ -232,7 +232,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"
;;
@@ -251,13 +251,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]")
# set redirects to 0, see vmgrid if you want to define some
redirects=0
@@ -298,7 +298,7 @@ hostmem=$(expr ${totalmem} - ${mem})
# 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]")
# virtual fd/cd/dvd and drive devices, floppy b: for configuration
# if $floppy_0 from run-virt.include set then fdtest="TRUE"
@@ -387,7 +387,7 @@ if [ -e ${PLUGINCONFROOT}/${xmlvirt}/run-virt.include ] ; then
done
# start poolvideoswitch if we find the autostarter file
if [ -e /etc/xdg/autostart/pvsgui.desktop ]; then
- /usr/local/bin/pvsgui >/dev/null 2>&1 &
+ /usr/local/bin/pvsgui -p 2 -b >/dev/null 2>&1 &
fi
${VIRTCMD} ${VIRTCMDOPTS}
writelog "Bye."