diff --git a/ChangeLog b/ChangeLog index ecc35a29fe0bf61d37a04c3cfc6f17d12f6638ec..673f36e4c93b2e62550e59ae1e8b06a02241778b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue May 12 17:25:52 CEST 2009 Daniel Veillard + + * src/network_driver.c: enable bridges which are not up, i.e. + without an IP address, patch by Ludwig Nussel + Mon May 11 16:25:22 BST 2009 Daniel P. Berrange * src/datatypes.c: Change hash destructors to call the internal diff --git a/src/network_driver.c b/src/network_driver.c index a17a7691d5586c49590bbcbf6dd38b3c5f8de6b3..a163b15aa1d35ca5cd889e85d2f4631f67f9a94d 100644 --- a/src/network_driver.c +++ b/src/network_driver.c @@ -836,8 +836,7 @@ static int networkStartNetworkDaemon(virConnectPtr conn, goto err_delbr; } - if (network->def->ipAddress && - (err = brSetInterfaceUp(driver->brctl, network->def->bridge, 1))) { + if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 1))) { virReportSystemError(conn, err, _("failed to bring the bridge '%s' up"), network->def->bridge); @@ -878,8 +877,7 @@ static int networkStartNetworkDaemon(virConnectPtr conn, networkRemoveIptablesRules(driver, network); err_delbr1: - if (network->def->ipAddress && - (err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) { + if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) { char ebuf[1024]; networkLog(NETWORK_WARN, _("Failed to bring down bridge '%s' : %s\n"), network->def->bridge, virStrerror(err, ebuf, sizeof ebuf)); @@ -920,8 +918,7 @@ static int networkShutdownNetworkDaemon(virConnectPtr conn, networkRemoveIptablesRules(driver, network); char ebuf[1024]; - if (network->def->ipAddress && - (err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) { + if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) { networkLog(NETWORK_WARN, _("Failed to bring down bridge '%s' : %s\n"), network->def->bridge, virStrerror(err, ebuf, sizeof ebuf)); }