From df3de82c06d42fed832c1955dafdee85879bd15a Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 30 Jul 2009 14:52:31 +0100 Subject: [PATCH] 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 --- src/network_driver.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/network_driver.c b/src/network_driver.c index 9621782a2f..1683631dda 100644 --- 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; -- 2.47.2