about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorMichał Pałka <michal.palka@chalmers.se>2016-10-26 16:26:01 +0000
committerMichał Pałka <michal.palka@chalmers.se>2016-10-26 16:26:01 +0000
commitfc3eed2cb01825d8024a535b8129ec0eeb0b1b84 (patch)
tree4000e7b29a815a1c5ee987899b03f16c7c48ea22 /nixos
parent63bf5670018fc902270b43f1b6883e676bac1c29 (diff)
downloadnixlib-fc3eed2cb01825d8024a535b8129ec0eeb0b1b84.tar
nixlib-fc3eed2cb01825d8024a535b8129ec0eeb0b1b84.tar.gz
nixlib-fc3eed2cb01825d8024a535b8129ec0eeb0b1b84.tar.bz2
nixlib-fc3eed2cb01825d8024a535b8129ec0eeb0b1b84.tar.lz
nixlib-fc3eed2cb01825d8024a535b8129ec0eeb0b1b84.tar.xz
nixlib-fc3eed2cb01825d8024a535b8129ec0eeb0b1b84.tar.zst
nixlib-fc3eed2cb01825d8024a535b8129ec0eeb0b1b84.zip
xen service: fix wrong netmask handed out by xen-bridge.service
The dnsmasq instance run by the xen-bridge.service errorenously
hands out 172.16.0.0 as the netmask over DHCP to the VMs. This
commit removes the option responsible for that from dnsmasq.conf,
so that the proper netmask is inferred by dnsmasq instead.

Addresses https://github.com/NixOS/nixpkgs/issues/19883
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/virtualisation/xen-dom0.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index a0b2d5363eb2..03e26dd8fb6e 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -324,7 +324,7 @@ in
         domain-needed
         dhcp-hostsfile=/var/run/xen/dnsmasq.etherfile
         dhcp-authoritative
-        dhcp-range=$XEN_BRIDGE_IP_RANGE_START,$XEN_BRIDGE_IP_RANGE_END,$XEN_BRIDGE_NETWORK_ADDRESS
+        dhcp-range=$XEN_BRIDGE_IP_RANGE_START,$XEN_BRIDGE_IP_RANGE_END
         dhcp-no-override
         no-ping
         dhcp-leasefile=/var/run/xen/dnsmasq.leasefile