diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 34eea9af83b1..ab7485500261 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -93,11 +93,13 @@ let
checkNetwork = checkUnitConfig "Network" [
(assertOnlyFields [
- "Description" "DHCP" "DHCPServer" "IPv4LL" "IPv4LLRoute"
+ "Description" "DHCP" "DHCPServer" "IPForward" "IPMasquerade" "IPv4LL" "IPv4LLRoute"
"LLMNR" "Domains" "Bridge" "Bond"
])
(assertValueOneOf "DHCP" ["both" "none" "v4" "v6"])
(assertValueOneOf "DHCPServer" boolValues)
+ (assertValueOneOf "IPForward" ["yes" "no" "ipv4" "ipv6"])
+ (assertValueOneOf "IPMasquerade" boolValues)
(assertValueOneOf "IPv4LL" boolValues)
(assertValueOneOf "IPv4LLRoute" boolValues)
(assertValueOneOf "LLMNR" boolValues)
@@ -129,6 +131,16 @@ let
(assertValueOneOf "RequestBroadcast" boolValues)
];
+ checkDhcpServer = checkUnitConfig "DHCPServer" [
+ (assertOnlyFields [
+ "PoolOffset" "PoolSize" "DefaultLeaseTimeSec" "MaxLeaseTimeSec"
+ "EmitDNS" "DNS" "EmitNTP" "NTP" "EmitTimezone" "Timezone"
+ ])
+ (assertValueOneOf "EmitDNS" boolValues)
+ (assertValueOneOf "EmitNTP" boolValues)
+ (assertValueOneOf "EmitTimezone" boolValues)
+ ];
+
commonNetworkOptions = {
enable = mkOption {
@@ -341,6 +353,18 @@ let
'';
};
+ dhcpServerConfig = mkOption {
+ default = {};
+ example = { PoolOffset = 50; EmitDNS = false; };
+ type = types.addCheck (types.attrsOf unitOption) checkDhcpServer;
+ description = ''
+ Each attribute in this set specifies an option in the
+ [DHCPServer] section of the unit. See
+ systemd.network
+ 5 for details.
+ '';
+ };
+
name = mkOption {
type = types.nullOr types.str;
default = null;
@@ -565,6 +589,11 @@ let
[DHCP]
${attrsToSection def.dhcpConfig}
+ ''}
+ ${optionalString (def.dhcpServerConfig != { }) ''
+ [DHCPServer]
+ ${attrsToSection def.dhcpServerConfig}
+
''}
${flip concatMapStrings def.addresses (x: ''
[Address]