diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index be10d7ddfd21..2385fa5c19a7 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -1060,6 +1060,7 @@ let sectionDHCPv4 = checkUnitConfig "DHCPv4" [ (assertOnlyFields [ "UseDNS" + "UseDNR" "RoutesToDNS" "UseNTP" "UseSIP" @@ -1097,8 +1098,10 @@ let "Use6RD" "NetLabel" "NFTSet" + "UseCaptivePortal" ]) (assertValueOneOf "UseDNS" boolValues) + (assertValueOneOf "UseDNR" boolValues) (assertValueOneOf "RoutesToDNS" boolValues) (assertValueOneOf "UseNTP" boolValues) (assertValueOneOf "UseSIP" boolValues) @@ -1131,13 +1134,16 @@ let "infinity" ]) (assertValueOneOf "Use6RD" boolValues) + (assertValueOneOf "UseCaptivePortal" boolValues) ]; sectionDHCPv6 = checkUnitConfig "DHCPv6" [ (assertOnlyFields [ "UseAddress" "UseDNS" + "UseDNR" "UseNTP" + "UseSIP" "SendHostname" "UseHostname" "Hostname" @@ -1159,10 +1165,13 @@ let "SendRelease" "NetLabel" "NFTSet" + "UseCaptivePortal" ]) (assertValueOneOf "UseAddress" boolValues) (assertValueOneOf "UseDNS" boolValues) + (assertValueOneOf "UseDNR" boolValues) (assertValueOneOf "UseNTP" boolValues) + (assertValueOneOf "UseSIP" boolValues) (assertValueOneOf "SendHostname" boolValues) (assertValueOneOf "UseHostname" boolValues) (assertValueOneOf "UseDomains" (boolValues ++ [ "route" ])) @@ -1177,6 +1186,7 @@ let (assertInt "IAID") (assertValueOneOf "UseDelegatedPrefix" boolValues) (assertValueOneOf "SendRelease" boolValues) + (assertValueOneOf "UseCaptivePortal" boolValues) ]; sectionDHCPPrefixDelegation = checkUnitConfig "DHCPPrefixDelegation" [ @@ -1200,6 +1210,7 @@ let sectionIPv6AcceptRA = checkUnitConfig "IPv6AcceptRA" [ (assertOnlyFields [ "UseDNS" + "UseDNR" "UseDomains" "RouteTable" "UseAutonomousPrefix" @@ -1219,8 +1230,14 @@ let "UsePREF64" "NetLabel" "NFTSet" + "UseCaptivePortal" + "UseRedirect" + "UseHopLimit" + "UseReachableTime" + "UseRetransmissionTime" ]) (assertValueOneOf "UseDNS" boolValues) + (assertValueOneOf "UseDNR" boolValues) (assertValueOneOf "UseDomains" (boolValues ++ [ "route" ])) (assertRange "RouteTable" 0 4294967295) (assertValueOneOf "UseAutonomousPrefix" boolValues) @@ -1230,6 +1247,11 @@ let (assertValueOneOf "UseGateway" boolValues) (assertValueOneOf "UseRoutePrefix" boolValues) (assertValueOneOf "UsePREF64" boolValues) + (assertValueOneOf "UseCaptivePortal" boolValues) + (assertValueOneOf "UseRedirect" boolValues) + (assertValueOneOf "UseHopLimit" boolValues) + (assertValueOneOf "UseReachableTime" boolValues) + (assertValueOneOf "UseRetransmissionTime" boolValues) ]; sectionDHCPServer = checkUnitConfig "DHCPServer" [