[Ovirt-devel] [PATCH] Change autotest to let libvirt use the TFTP root created.

[Darryl L. Pierce]

Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
 autotest.sh |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/autotest.sh b/autotest.sh
index 32a60d9..09c0535 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -190,23 +190,24 @@ start_networking () {
     done
 
     definition="<network>\n<name>${ifacename}</name>\n<forward mode='nat' />\n<bridge name='${ifacename}' stp='on' forwardDelay='0' />"
-    definition="${definition}\n<ip address='${network}.1' netmask='255.255.255.0'>"
+    definition="${definition}\n<ip address='${network}.1' netmask='255.255.255.0'>\n<tftp root='${workdir}' />\n"
     if $use_dhcp; then
         definition="${definition}\n<dhcp>\n<range start='${network}.100' end='${network}.199' />\n</dhcp>"
     fi
     definition="${definition}\n</ip>\n</network>"
 
     debug "Saving network definition file to: ${xmlfile}\n"
+    debug "net-xml:\n${definition}\n"
     sudo printf "${definition}" > $xmlfile
     sudo virsh net-define $xmlfile > /dev/null 2>&1
     debug "Starting network."
     sudo virsh net-start $ifacename > /dev/null 2>&1
 
-    if [ "${use_dhcp}" == "false" ]; then
-        if $start_dnsmasq; then
-            start_dnsmasq $ifacename $workdir "" $nodename
-        fi
-    fi
+#    if [ "${use_dhcp}" == "false" ]; then
+#        if $start_dnsmasq; then
+#            start_dnsmasq $ifacename $workdir "" $nodename
+#        fi
+#    fi
 }
 
 # Destroys the test network interface
-- 
1.6.6.1