[fedora-virt-maint] rpms/libvirt/F-11 libvirt-0.6.2-bring-up-ipless-bridge.patch, NONE, 1.1 libvirt.spec, 1.132, 1.133
Mark McLoughlin
markmc at fedoraproject.org
Mon May 25 15:23:47 UTC 2009
- Previous message (by thread): [fedora-virt-maint] rpms/libvirt/devel libvirt-0.6.3-bring-up-ipless-bridge.patch, NONE, 1.1 libvirt.spec, 1.135, 1.136
- Next message (by thread): [fedora-virt-maint] rpms/libguestfs/devel .cvsignore, 1.11, 1.12 libguestfs.spec, 1.26, 1.27 sources, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: markmc
Update of /cvs/pkgs/rpms/libvirt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32627
Modified Files:
libvirt.spec
Added Files:
libvirt-0.6.2-bring-up-ipless-bridge.patch
Log Message:
* Mon May 25 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-11.fc11
- Bring up the bridge, even if it doesn't have an IP address (bug #501912)
libvirt-0.6.2-bring-up-ipless-bridge.patch:
--- NEW FILE libvirt-0.6.2-bring-up-ipless-bridge.patch ---
>From 4db7474b0c1907e877d7206edeb4d73962971096 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard at redhat.com>
Date: Tue, 12 May 2009 15:31:22 +0000
Subject: [PATCH 1/1] * src/network_driver.c: enable bridges which are not up
without an IP address, patch by Ludwig Nussel
Daniel
---
src/network_driver.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/network_driver.c b/src/network_driver.c
index a17a769..a163b15 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));
}
--
1.6.0.6
Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- libvirt.spec 22 May 2009 09:24:30 -0000 1.132
+++ libvirt.spec 25 May 2009 15:23:17 -0000 1.133
@@ -66,7 +66,7 @@
Summary: Library providing a simple API virtualization
Name: libvirt
Version: 0.6.2
-Release: 10%{?dist}%{?extra_release}
+Release: 11%{?dist}%{?extra_release}
License: LGPLv2+
Group: Development/Libraries
Source: libvirt-%{version}.tar.gz
@@ -92,6 +92,8 @@ Patch8: libvirt-0.6.2-event-handling-1.p
Patch9: libvirt-0.6.2-event-handling-2.patch
# Don't log monitor output to domain log file (bz 499584)
Patch10: libvirt-0.6.2-do-not-log-monitor-output.patch
+# Bring up the bridge, even if it doesn't have an IP address (bz 501912)
+Patch11: libvirt-0.6.2-bring-up-ipless-bridge.patch
# Not for upstream. Temporary hack till PulseAudio autostart
# problems are sorted out when SELinux enforcing
@@ -257,6 +259,7 @@ of recent versions of Linux (and other O
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
%patch200 -p0
@@ -580,6 +583,9 @@ fi
%endif
%changelog
+* Mon May 25 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-11.fc11
+- Bring up the bridge, even if it doesn't have an IP address (bug #501912)
+
* Fri May 22 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-10.fc11
- Don't log monitor output to domain log file (bug #499584)
- Previous message (by thread): [fedora-virt-maint] rpms/libvirt/devel libvirt-0.6.3-bring-up-ipless-bridge.patch, NONE, 1.1 libvirt.spec, 1.135, 1.136
- Next message (by thread): [fedora-virt-maint] rpms/libguestfs/devel .cvsignore, 1.11, 1.12 libguestfs.spec, 1.26, 1.27 sources, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Fedora-virt-maint
mailing list