Unverified Commit 03197858 authored by Will Fancher's avatar Will Fancher Committed by GitHub
Browse files

Merge pull request #291882 from philiptaron/systemd-networkd/boolValuesPlus 

nixos/networkd: accept `true` and `false` in addition to "yes" and "no" for DHCP= and LinkLocalAddressing=
parents 200e73d9 27d6c242

nixos/modules/system/boot/networkd.nix

+2 −2
Original line number Diff line number Diff line
@@ -647,9 +647,9 @@ let 
          "BatmanAdvanced"

        ])

        # Note: For DHCP the values both, none, v4, v6 are deprecated

        (assertValueOneOf "DHCP" ["yes" "no" "ipv4" "ipv6"])

        (assertValueOneOf "DHCP" (boolValues ++ ["ipv4" "ipv6"]))

        (assertValueOneOf "DHCPServer" boolValues)

        (assertValueOneOf "LinkLocalAddressing" ["yes" "no" "ipv4" "ipv6" "fallback" "ipv4-fallback"])

        (assertValueOneOf "LinkLocalAddressing" (boolValues ++ ["ipv4" "ipv6" "fallback" "ipv4-fallback"]))

        (assertValueOneOf "IPv6LinkLocalAddressGenerationMode" ["eui64" "none" "stable-privacy" "random"])

        (assertValueOneOf "IPv4LLRoute" boolValues)

        (assertValueOneOf "DefaultRouteOnDevice" boolValues)