dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nixos/systemd/networkd: Add missing network section options

Browse Source
This commit is contained in:
Jack O'Sullivan 2024-03-18 16:25:10 +00:00
parent fa42b5a5f4
commit 798b11de8e
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/system/boot/networkd.nix
View File

@ -230,6 +230,7 @@ let
sectionVLAN = checkUnitConfig "VLAN" [ sectionVLAN = checkUnitConfig "VLAN" [
(assertOnlyFields [ (assertOnlyFields [
"Id" "Id"
"Protocol"
"GVRP" "GVRP"
"MVRP" "MVRP"
"LooseBinding" "LooseBinding"
@ -237,6 +238,7 @@ let
]) ])
(assertInt "Id") (assertInt "Id")
(assertRange "Id" 0 4094) (assertRange "Id" 0 4094)
(assertValueOneOf "Protocol" ["802.1q" "802.1ad"])
(assertValueOneOf "GVRP" boolValues) (assertValueOneOf "GVRP" boolValues)
(assertValueOneOf "MVRP" boolValues) (assertValueOneOf "MVRP" boolValues)
(assertValueOneOf "LooseBinding" boolValues) (assertValueOneOf "LooseBinding" boolValues)
@ -700,6 +702,9 @@ let
"Xfrm" "Xfrm"
"KeepConfiguration" "KeepConfiguration"
"BatmanAdvanced" "BatmanAdvanced"
"IPoIB"
"L2TP"
"MACVTAP"
]) ])
# Note: For DHCP the values both, none, v4, v6 are deprecated # Note: For DHCP the values both, none, v4, v6 are deprecated
(assertValueOneOf "DHCP" (boolValues ++ ["ipv4" "ipv6"])) (assertValueOneOf "DHCP" (boolValues ++ ["ipv4" "ipv6"]))
@ -968,9 +973,13 @@ let
sectionIPv6AcceptRA = checkUnitConfig "IPv6AcceptRA" [ sectionIPv6AcceptRA = checkUnitConfig "IPv6AcceptRA" [
(assertOnlyFields [ (assertOnlyFields [
"Token"
"UseDNS" "UseDNS"
"UseDomains" "UseDomains"
"RouteTable" "RouteTable"
"UseMTU"
"UseGateway"
"UseRoutePrefix"
"UseAutonomousPrefix" "UseAutonomousPrefix"
"UseOnLinkPrefix" "UseOnLinkPrefix"
"RouterDenyList" "RouterDenyList"
@ -990,6 +999,9 @@ let
(assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "UseDNS" boolValues)
(assertValueOneOf "UseDomains" (boolValues ++ ["route"])) (assertValueOneOf "UseDomains" (boolValues ++ ["route"]))
(assertRange "RouteTable" 0 4294967295) (assertRange "RouteTable" 0 4294967295)
(assertValueOneOf "UseMTU" boolValues)
(assertValueOneOf "UseGateway" boolValues)
(assertValueOneOf "UseRoutePrefix" boolValues)
(assertValueOneOf "UseAutonomousPrefix" boolValues) (assertValueOneOf "UseAutonomousPrefix" boolValues)
(assertValueOneOf "UseOnLinkPrefix" boolValues) (assertValueOneOf "UseOnLinkPrefix" boolValues)
(assertValueOneOf "DHCPv6Client" (boolValues ++ ["always"])) (assertValueOneOf "DHCPv6Client" (boolValues ++ ["always"]))