summary refs log tree commit diff
path: root/nixos/modules/system
diff options
context:
space:
mode:
authorMartin Weinelt <mweinelt@users.noreply.github.com>2022-08-26 11:50:50 +0200
committerGitHub <noreply@github.com>2022-08-26 11:50:50 +0200
commit2ae8a945fb63714db951c4304135601cc18fd261 (patch)
tree85d9b728ecb5d4ee93adec4ed79e79b9153e696c /nixos/modules/system
parent4f2dd0099fbc8be5aec880e1cbdde4e652afa24c (diff)
parent8b74b21d237eb4be2e769f4f5ef24e6361f8edcc (diff)
downloadnixpkgs-2ae8a945fb63714db951c4304135601cc18fd261.tar
nixpkgs-2ae8a945fb63714db951c4304135601cc18fd261.tar.gz
nixpkgs-2ae8a945fb63714db951c4304135601cc18fd261.tar.bz2
nixpkgs-2ae8a945fb63714db951c4304135601cc18fd261.tar.lz
nixpkgs-2ae8a945fb63714db951c4304135601cc18fd261.tar.xz
nixpkgs-2ae8a945fb63714db951c4304135601cc18fd261.tar.zst
nixpkgs-2ae8a945fb63714db951c4304135601cc18fd261.zip
Merge pull request #188309 from Sohalt/systemd-networkd-dhcpserver-missing-options
Diffstat (limited to 'nixos/modules/system')
-rw-r--r--nixos/modules/system/boot/networkd.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index be6c534d5c0..1fe7691fc9a 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -803,10 +803,12 @@ let
 
       sectionDHCPServer = checkUnitConfig "DHCPServer" [
         (assertOnlyFields [
+          "ServerAddress"
           "PoolOffset"
           "PoolSize"
           "DefaultLeaseTimeSec"
           "MaxLeaseTimeSec"
+          "UplinkInterface"
           "EmitDNS"
           "DNS"
           "EmitNTP"
@@ -820,10 +822,15 @@ let
           "EmitLPR"
           "LPR"
           "EmitRouter"
+          "Router"
           "EmitTimezone"
           "Timezone"
           "SendOption"
           "SendVendorOption"
+          "BindToInterface"
+          "RelayTarget"
+          "RelayAgentCircuitId"
+          "RelayAgentRemoteId"
         ])
         (assertInt "PoolOffset")
         (assertMinimum "PoolOffset" 0)
@@ -837,6 +844,7 @@ let
         (assertValueOneOf "EmitLPR" boolValues)
         (assertValueOneOf "EmitRouter" boolValues)
         (assertValueOneOf "EmitTimezone" boolValues)
+        (assertValueOneOf "BindToInterface" boolValues)
       ];
 
       sectionIPv6SendRA = checkUnitConfig "IPv6SendRA" [
@@ -845,6 +853,7 @@ let
           "OtherInformation"
           "RouterLifetimeSec"
           "RouterPreference"
+          "UplinkInterface"
           "EmitDNS"
           "DNS"
           "EmitDomains"