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: 30a33a55ddb4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e2f9c1b97b08
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 28, 2017

  1. xen service: fix xen-bridge not setting the configured netmask 

    The xen-bridge service accepts the option prefixLength, but does not
use it to set the actual netmask on the bridge. This commit makes
it set the correct netmask.
    Michał Pałka committed Apr 28, 2017
    Copy the full SHA
    2fcb871 View commit details

Commits on May 6, 2017

  1. Merge pull request #25281 from michalpalka/master 

    xen service: fix xen-bridge not setting the configured netmask
    @joachifm
    joachifm authored May 6, 2017

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 5EF7BA26748D673D
    Learn about vigilant mode
    Copy the full SHA
    e2f9c1b View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 nixos/modules/virtualisation/xen-dom0.nix
4 changes: 4 additions & 0 deletions nixos/modules/virtualisation/xen-dom0.nix
View file
Original file line number Diff line number Diff line change
@@ -331,6 +331,9 @@ in
IFS='-' read -a data <<< `${pkgs.sipcalc}/bin/sipcalc ${cfg.bridge.address}/${toString cfg.bridge.prefixLength} | grep Network\ address`
export XEN_BRIDGE_NETWORK_ADDRESS="${"\${data[1]//[[:blank:]]/}"}"
IFS='-' read -a data <<< `${pkgs.sipcalc}/bin/sipcalc ${cfg.bridge.address}/${toString cfg.bridge.prefixLength} | grep Network\ mask`
export XEN_BRIDGE_NETMASK="${"\${data[1]//[[:blank:]]/}"}"
echo "${cfg.bridge.address} host gw dns" > /var/run/xen/dnsmasq.hostsfile
cat <<EOF > /var/run/xen/dnsmasq.conf
@@ -369,6 +372,7 @@ in
${pkgs.bridge-utils}/bin/brctl addbr ${cfg.bridge.name}
${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} ${cfg.bridge.address}
${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} netmask $XEN_BRIDGE_NETMASK
${pkgs.inetutils}/bin/ifconfig ${cfg.bridge.name} up
'';
serviceConfig.ExecStart = "${pkgs.dnsmasq}/bin/dnsmasq --conf-file=/var/run/xen/dnsmasq.conf";