Blame SOURCES/libvirt-Silently-ignore-MAC-in-NetworkLoadConfig.patch
|
 |
9119d9 |
From 4dda2d06f4a4c9a526ccdac389ab3c51475fb6b0 Mon Sep 17 00:00:00 2001
|
|
|
9119d9 |
Message-Id: <4dda2d06f4a4c9a526ccdac389ab3c51475fb6b0@dist-git>
|
|
|
9119d9 |
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
|
9119d9 |
Date: Tue, 2 Dec 2014 16:12:34 +0100
|
|
|
9119d9 |
Subject: [PATCH] Silently ignore MAC in NetworkLoadConfig
|
|
|
9119d9 |
|
|
|
9119d9 |
Libvirt's RPMs have been adding it to networks which don't support it.
|
|
|
9119d9 |
|
|
|
9119d9 |
https://bugzilla.redhat.com/show_bug.cgi?id=1156367
|
|
|
9119d9 |
(cherry picked from commit c9c7a2bd964d02f1c1ffc542cb18bf851852dd37)
|
|
|
9119d9 |
|
|
|
9119d9 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
9119d9 |
---
|
|
|
9119d9 |
src/conf/network_conf.c | 4 ++++
|
|
|
9119d9 |
1 file changed, 4 insertions(+)
|
|
|
9119d9 |
|
|
|
9119d9 |
diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
|
|
|
9119d9 |
index 863d0e2..d348a20 100644
|
|
|
9119d9 |
--- a/src/conf/network_conf.c
|
|
|
9119d9 |
+++ b/src/conf/network_conf.c
|
|
|
9119d9 |
@@ -3152,6 +3152,10 @@ virNetworkObjPtr virNetworkLoadConfig(virNetworkObjListPtr nets,
|
|
|
9119d9 |
*/
|
|
|
9119d9 |
if (virNetworkSetBridgeName(nets, def, 0))
|
|
|
9119d9 |
goto error;
|
|
|
9119d9 |
+ } else {
|
|
|
9119d9 |
+ /* Throw away MAC address for other forward types,
|
|
|
9119d9 |
+ * which could have been generated by older libvirt RPMs */
|
|
|
9119d9 |
+ def->mac_specified = false;
|
|
|
9119d9 |
}
|
|
|
9119d9 |
|
|
|
9119d9 |
if (!(net = virNetworkAssignDef(nets, def, false)))
|
|
|
9119d9 |
--
|
|
|
9119d9 |
2.2.0
|
|
|
9119d9 |
|