Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6ef9875edb51
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dc2fc5ed575f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 4, 2017

  1. xen service: Forward DNS queries from Xen guests 

    Provide the option forwardDns in virtualisation.xen.bridge, which
enables forwarding of DNS queries to the default resolver, allowing
outside internet access for the xen guests.
    Michał Pałka committed May 4, 2017
    Copy the full SHA
    e7203cb View commit details

Commits on May 6, 2017

  1. Merge pull request #25495 from michalpalka/xen-forward-dns 

    xen service: Forward DNS queries from Xen guests
    @joachifm
    joachifm authored May 6, 2017
    Copy the full SHA
    dc2fc5e View commit details
Showing with 15 additions and 3 deletions.
  1. +15 −3 nixos/modules/virtualisation/xen-dom0.nix
18 changes: 15 additions & 3 deletions nixos/modules/virtualisation/xen-dom0.nix
View file
Original file line number Diff line number Diff line change
@@ -100,6 +100,16 @@ in
subnet.
'';
};

forwardDns = mkOption {
default = false;
description = ''
If set to <literal>true</literal>, the DNS queries from the
hosts connected to the bridge will be forwarded to the DNS
servers specified in /etc/resolv.conf .
'';
};

};

virtualisation.xen.stored =
@@ -359,16 +369,18 @@ in
interface=${cfg.bridge.name}
except-interface=lo
bind-interfaces
auth-server=dns.xen.local,${cfg.bridge.name}
auth-zone=xen.local,$XEN_BRIDGE_NETWORK_ADDRESS/${toString cfg.bridge.prefixLength}
domain=xen.local
addn-hosts=/var/run/xen/dnsmasq.hostsfile
expand-hosts
strict-order
no-hosts
bogus-priv
no-resolv
no-poll
${optionalString (!cfg.bridge.forwardDns) ''
no-resolv
no-poll
auth-server=dns.xen.local,${cfg.bridge.name}
''}
filterwin2k
clear-on-reload
domain-needed