From 5dd09617cd77f2a616c770152c4cd8319803a05f Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Fri, 2 Apr 2010 20:50:29 +0200
Subject: qemu tap coniguration hell

---
 os-plugins/plugins/vmgrid/files/run-vmgrid.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'os-plugins/plugins/vmgrid')

diff --git a/os-plugins/plugins/vmgrid/files/run-vmgrid.sh b/os-plugins/plugins/vmgrid/files/run-vmgrid.sh
index 716371d5..626dfcca 100644
--- a/os-plugins/plugins/vmgrid/files/run-vmgrid.sh
+++ b/os-plugins/plugins/vmgrid/files/run-vmgrid.sh
@@ -162,7 +162,7 @@ writelog "\tVM XML dir:\t\t$(dirname ${xmlfile})"
 
 if ! grep '<?xml' "${xmlfile}" >/dev/null 2>&1; then
   writelog \
-    "\tSubmitted configuration file ${xmlfile} seems to have wrong XML format"
+    "Submitted configuration file ${xmlfile} seems to have wrong XML format"
   exit 1
 fi
 
@@ -208,7 +208,7 @@ fi
 # check if virtual machine container file exists, only if not rwimg
 if ! [ -e "${vmpath}" ] && [ "${imgmode}" != "rwimg" ] && [ ${diskless} -eq 0 ];
 then
-  writelog "\tVirtual machine image or directory ${vmpath} not found!"
+  writelog "Virtual machine image or directory ${vmpath} not found!"
   exit 1
 fi
 
@@ -239,8 +239,8 @@ xmlvirt=$(grep -o 'virtualmachine param=.*"' ${xmlfile} \
 # make a guess from the filename extension if ${xmlvirt} is empty
 # (not set within the XML file)
 if [ -z "${xmlvirt}" ] && [ -n "${additional_config}" ]; then
-  writelog "\tNo virtual machine parameter defined in ${xmlfile}"
-  writelog "\tTrying to guess VM...\c"
+  writelog "No virtual machine parameter defined in ${xmlfile}"
+  writelog "Trying to guess VM...\c"
   case "$(cat ${additional_config} | tr [A-Z] [a-z])" in
     *config.version*|*virtualhw.version*|*independent-nonpersistent*|*vmdk*)
       xmlvirt="vmware"
@@ -275,8 +275,8 @@ fi
 
 # check for virt
 if [ "${vmgrid_virt}" != "${xmlvirt}" ]; then
-  writelog "\tThe virtual machine specified in ${xmlfile}"
-  writelog "\tdoes not match the virtualization used here (${vmgrid_virt})"
+  writelog "The virtual machine specified in ${xmlfile}"
+  writelog "does not match the virtualization used here (${vmgrid_virt})"
   exit 1
 fi
 
-- 
cgit v1.2.3-55-g7522