forked from pool/libvirt
827fa7dc68
- libxl: fix VM migration on busy hosts
60b4fd90-libxl-rm-vm-finish-phase.patch,
e39c66d3-libxl-fix-p2p-migration.patch,
47da84e0-libxl-fix-job-handling-migsrc.patch,
0149464a-libxl-fix-job-handling-migdst.patch,
5ea2abb3-libxl-join-mig-rcv-thread.patch
bsc#1108086
- Update to libvirt 4.7.0
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped patches:
9ed59012--revert-jansson1.patch,
54f2b5e3-revert-jansson2.patch,
b56950fd-revert-jansson3.patch,
6c3d66ac-revert-jansson4.patch,
8e373e6d-revert-jansson5.patch,
6f99de31-revert-jansson6.patch,
f204cf51-revert-jansson7.patch,
5a58b5ed-revert-jansson8.patch,
63f6e0e9-revert-jansson9.patch,
8687eba-revert-jansson10.patch,
e96e71d8-revert-jansson11.patch,
d99a8959-revert-jansson12.patch,
074a7e14-revert-jansson13.patch
OBS-URL: https://build.opensuse.org/request/show/636920
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=704
52 lines
2.4 KiB
Diff
52 lines
2.4 KiB
Diff
From 15c7f9a6e7678238ef06f5d805984addb6f8bcdb Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Thu, 15 Dec 2016 10:17:05 +0100
|
|
Subject: [PATCH] network: don't use dhcp-authoritative on static networks
|
|
|
|
"Static" DHCP networks are those where no dynamic DHCP range is
|
|
defined, only a list of host entries is used to serve permanent
|
|
IP addresses. On such networks, we don't want dnsmasq to reply
|
|
to other requests than those statically defined. But
|
|
"dhcp-authoritative" will cause dnsmasq to do just that.
|
|
Therefore we can't use "dhcp-authoritative" for static networks.
|
|
|
|
Fixes: 4ac20b3ae "network: add dnsmasq option 'dhcp-authoritative'"
|
|
Signed-off-by: Martin Wilck <mwilck@suse.com>
|
|
---
|
|
src/network/bridge_driver.c | 9 ++++++++-
|
|
tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 -
|
|
2 files changed, 8 insertions(+), 2 deletions(-)
|
|
|
|
Index: libvirt-4.7.0/src/network/bridge_driver.c
|
|
===================================================================
|
|
--- libvirt-4.7.0.orig/src/network/bridge_driver.c
|
|
+++ libvirt-4.7.0/src/network/bridge_driver.c
|
|
@@ -1463,7 +1463,14 @@ networkDnsmasqConfContents(virNetworkObj
|
|
if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET)) {
|
|
if (ipdef->nranges || ipdef->nhosts) {
|
|
virBufferAddLit(&configbuf, "dhcp-no-override\n");
|
|
- virBufferAddLit(&configbuf, "dhcp-authoritative\n");
|
|
+ /*
|
|
+ * Use "dhcp-authoritative" only for dynamic DHCP.
|
|
+ * In a static-only network, it would cause dnsmasq
|
|
+ * to reply to requests from other hosts than those
|
|
+ * statically defined.
|
|
+ */
|
|
+ if (ipdef->nranges || !ipdef->nhosts)
|
|
+ virBufferAddLit(&configbuf, "dhcp-authoritative\n");
|
|
}
|
|
|
|
if (ipdef->tftproot) {
|
|
Index: libvirt-4.7.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
|
|
===================================================================
|
|
--- libvirt-4.7.0.orig/tests/networkxml2confdata/dhcp6host-routed-network.conf
|
|
+++ libvirt-4.7.0/tests/networkxml2confdata/dhcp6host-routed-network.conf
|
|
@@ -10,7 +10,6 @@ bind-dynamic
|
|
interface=virbr1
|
|
dhcp-range=192.168.122.1,static
|
|
dhcp-no-override
|
|
-dhcp-authoritative
|
|
dhcp-range=2001:db8:ac10:fd01::1,static,64
|
|
dhcp-hostsfile=/var/lib/libvirt/dnsmasq/local.hostsfile
|
|
addn-hosts=/var/lib/libvirt/dnsmasq/local.addnhosts
|