Allow dnsmasq to provide DNS without DHCP

* src/network_driver.c: Always start dnsmasq to allow it to provide
  DNS, even if no DHCP ranges are enabled

diff --git a/src/network_driver.c b/src/network_driver.c
index 9621782a2f9dd45827409df4cc413216bfd71a9f..1683631dda46bc15d9b4576f6e4be550d60d0cb0 100644 (file)
--- a/src/network_driver.c
+++ b/src/network_driver.c
@@ -136,8 +136,9 @@ networkFindActiveConfigs(struct network_driver *driver) {
             brHasBridge(driver->brctl, obj->def->bridge) == 0) {
             obj->active = 1;
 
-            /* Finally try and read dnsmasq pid if any DHCP ranges are set */
-            if (obj->def->nranges &&
+            /* Finally try and read dnsmasq pid if any */
+            if ((obj->def->ipAddress ||
+                 obj->def->nranges) &&
                 virFileReadPid(NETWORK_PID_DIR, obj->def->name,
                                &obj->dnsmasqPid) == 0) {
 
@@ -844,7 +845,8 @@ static int networkStartNetworkDaemon(virConnectPtr conn,
         goto err_delbr2;
     }
 
-    if (network->def->nranges &&
+    if ((network->def->ipAddress ||
+         network->def->nranges) &&
         dhcpStartDhcpDaemon(conn, network) < 0)
         goto err_delbr2;