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: ec6c4a83bea8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f96eabaa03e9
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 24, 2019

  1. nixos/network: replace deprecated DHCP=both by DHCP=yes 

    (cherry picked from commit a0a3675)
    @rvolosatovs @globin
    rvolosatovs authored and globin committed Sep 24, 2019
    Copy the full SHA
    f96eaba View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/tasks/network-interfaces-systemd.nix
2 changes: 1 addition & 1 deletion nixos/modules/tasks/network-interfaces-systemd.nix
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ let
i.ipv4.addresses
++ optionals cfg.enableIPv6 i.ipv6.addresses;

dhcpStr = useDHCP: if useDHCP == true || useDHCP == null then "both" else "no";
dhcpStr = useDHCP: if useDHCP == true || useDHCP == null then "yes" else "no";

slaves =
concatLists (map (bond: bond.interfaces) (attrValues cfg.bonds))