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

Commits on Oct 29, 2020

  1. nixos/networkd: allow RouteMetric= in [DHCPv6] section

    @flokli
    flokli committed Oct 29, 2020
    Copy the full SHA
    b8d59e9 View commit details

  2. Merge pull request #102096 from flokli/networkd-dhcpv6-route-metric 

    nixos/networkd: allow RouteMetric= in [DHCPv6] section
    @mweinelt
    mweinelt authored Oct 29, 2020
    Copy the full SHA
    a9df495 View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 nixos/modules/system/boot/networkd.nix
2 changes: 2 additions & 0 deletions nixos/modules/system/boot/networkd.nix
View file
Original file line number Diff line number Diff line change
@@ -648,11 +648,13 @@ let
"RapidCommit"
"ForceDHCPv6PDOtherInformation"
"PrefixDelegationHint"
"RouteMetric"
])
(assertValueOneOf "UseDNS" boolValues)
(assertValueOneOf "UseNTP" boolValues)
(assertValueOneOf "RapidCommit" boolValues)
(assertValueOneOf "ForceDHCPv6PDOtherInformation" boolValues)
(assertInt "RouteMetric")
];

sectionDHCPServer = checkUnitConfig "DHCPServer" [