From 09ca9cdb0ca0e561226706fd0b03a517f88b4228 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Wed, 14 Jan 2026 13:05:00 -0800 Subject: [PATCH 1/7] nixos/systemd-networkd: Add missing UseCaptivePortal option --- nixos/modules/system/boot/networkd.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index be10d7ddfd21..94067a6dde0d 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -1097,6 +1097,7 @@ let "Use6RD" "NetLabel" "NFTSet" + "UseCaptivePortal" ]) (assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "RoutesToDNS" boolValues) @@ -1131,6 +1132,7 @@ let "infinity" ]) (assertValueOneOf "Use6RD" boolValues) + (assertValueOneOf "UseCaptivePortal" boolValues) ]; sectionDHCPv6 = checkUnitConfig "DHCPv6" [ @@ -1159,6 +1161,7 @@ let "SendRelease" "NetLabel" "NFTSet" + "UseCaptivePortal" ]) (assertValueOneOf "UseAddress" boolValues) (assertValueOneOf "UseDNS" boolValues) @@ -1177,6 +1180,7 @@ let (assertInt "IAID") (assertValueOneOf "UseDelegatedPrefix" boolValues) (assertValueOneOf "SendRelease" boolValues) + (assertValueOneOf "UseCaptivePortal" boolValues) ]; sectionDHCPPrefixDelegation = checkUnitConfig "DHCPPrefixDelegation" [ @@ -1219,6 +1223,7 @@ let "UsePREF64" "NetLabel" "NFTSet" + "UseCaptivePortal" ]) (assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "UseDomains" (boolValues ++ [ "route" ])) @@ -1230,6 +1235,7 @@ let (assertValueOneOf "UseGateway" boolValues) (assertValueOneOf "UseRoutePrefix" boolValues) (assertValueOneOf "UsePREF64" boolValues) + (assertValueOneOf "UseCaptivePortal" boolValues) ]; sectionDHCPServer = checkUnitConfig "DHCPServer" [ From 4fb5d816d1362f895d4752df6f758ed66108b51e Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Wed, 14 Jan 2026 13:05:17 -0800 Subject: [PATCH 2/7] nixos/systemd-networkd: Add missing UseRedirect option --- nixos/modules/system/boot/networkd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 94067a6dde0d..1391e05bbebf 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -1224,6 +1224,7 @@ let "NetLabel" "NFTSet" "UseCaptivePortal" + "UseRedirect" ]) (assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "UseDomains" (boolValues ++ [ "route" ])) @@ -1236,6 +1237,7 @@ let (assertValueOneOf "UseRoutePrefix" boolValues) (assertValueOneOf "UsePREF64" boolValues) (assertValueOneOf "UseCaptivePortal" boolValues) + (assertValueOneOf "UseRedirect" boolValues) ]; sectionDHCPServer = checkUnitConfig "DHCPServer" [ From 59d0fa5528fc8b39d7a43c04b706ae3a59b86826 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Wed, 14 Jan 2026 13:08:27 -0800 Subject: [PATCH 3/7] nixos/systemd-networkd: Add missing UseDNR option --- nixos/modules/system/boot/networkd.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 1391e05bbebf..d8e7c082458d 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" @@ -1100,6 +1101,7 @@ let "UseCaptivePortal" ]) (assertValueOneOf "UseDNS" boolValues) + (assertValueOneOf "UseDNR" boolValues) (assertValueOneOf "RoutesToDNS" boolValues) (assertValueOneOf "UseNTP" boolValues) (assertValueOneOf "UseSIP" boolValues) @@ -1139,6 +1141,7 @@ let (assertOnlyFields [ "UseAddress" "UseDNS" + "UseDNR" "UseNTP" "SendHostname" "UseHostname" @@ -1165,6 +1168,7 @@ let ]) (assertValueOneOf "UseAddress" boolValues) (assertValueOneOf "UseDNS" boolValues) + (assertValueOneOf "UseDNR" boolValues) (assertValueOneOf "UseNTP" boolValues) (assertValueOneOf "SendHostname" boolValues) (assertValueOneOf "UseHostname" boolValues) @@ -1204,6 +1208,7 @@ let sectionIPv6AcceptRA = checkUnitConfig "IPv6AcceptRA" [ (assertOnlyFields [ "UseDNS" + "UseDNR" "UseDomains" "RouteTable" "UseAutonomousPrefix" @@ -1227,6 +1232,7 @@ let "UseRedirect" ]) (assertValueOneOf "UseDNS" boolValues) + (assertValueOneOf "UseDNR" boolValues) (assertValueOneOf "UseDomains" (boolValues ++ [ "route" ])) (assertRange "RouteTable" 0 4294967295) (assertValueOneOf "UseAutonomousPrefix" boolValues) From 29b777151ebebf97a70fadc636423851e21fbfd1 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Wed, 14 Jan 2026 13:10:32 -0800 Subject: [PATCH 4/7] nixos/systemd-networkd: Add missing UseHopLimit option --- nixos/modules/system/boot/networkd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index d8e7c082458d..17b4453cf538 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -1230,6 +1230,7 @@ let "NFTSet" "UseCaptivePortal" "UseRedirect" + "UseHopLimit" ]) (assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "UseDNR" boolValues) @@ -1244,6 +1245,7 @@ let (assertValueOneOf "UsePREF64" boolValues) (assertValueOneOf "UseCaptivePortal" boolValues) (assertValueOneOf "UseRedirect" boolValues) + (assertValueOneOf "UseHopLimit" boolValues) ]; sectionDHCPServer = checkUnitConfig "DHCPServer" [ From d6a9c47e0f2d6e9116e3669e0081ba90cd49b725 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Wed, 14 Jan 2026 13:11:33 -0800 Subject: [PATCH 5/7] nixos/systemd-networkd: Add missing UseReachableTime option --- nixos/modules/system/boot/networkd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 17b4453cf538..2bf1ac8d0531 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -1231,6 +1231,7 @@ let "UseCaptivePortal" "UseRedirect" "UseHopLimit" + "UseReachableTime" ]) (assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "UseDNR" boolValues) @@ -1246,6 +1247,7 @@ let (assertValueOneOf "UseCaptivePortal" boolValues) (assertValueOneOf "UseRedirect" boolValues) (assertValueOneOf "UseHopLimit" boolValues) + (assertValueOneOf "UseReachableTime" boolValues) ]; sectionDHCPServer = checkUnitConfig "DHCPServer" [ From 05c7d124f30eea931ccd2d147449c2ae9206c623 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Wed, 14 Jan 2026 13:12:50 -0800 Subject: [PATCH 6/7] nixos/systemd-networkd: Add missing UseRetransmissionTime option --- nixos/modules/system/boot/networkd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 2bf1ac8d0531..fd1fa65ef945 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -1232,6 +1232,7 @@ let "UseRedirect" "UseHopLimit" "UseReachableTime" + "UseRetransmissionTime" ]) (assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "UseDNR" boolValues) @@ -1248,6 +1249,7 @@ let (assertValueOneOf "UseRedirect" boolValues) (assertValueOneOf "UseHopLimit" boolValues) (assertValueOneOf "UseReachableTime" boolValues) + (assertValueOneOf "UseRetransmissionTime" boolValues) ]; sectionDHCPServer = checkUnitConfig "DHCPServer" [ From 3e126bfbb88e5cf2574659a7d637659db958d61d Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Thu, 15 Jan 2026 06:56:57 -0800 Subject: [PATCH 7/7] nixos/systemd-networkd: Add missing UseSIP option to DHCPv6 --- nixos/modules/system/boot/networkd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index fd1fa65ef945..2385fa5c19a7 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -1143,6 +1143,7 @@ let "UseDNS" "UseDNR" "UseNTP" + "UseSIP" "SendHostname" "UseHostname" "Hostname" @@ -1170,6 +1171,7 @@ let (assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "UseDNR" boolValues) (assertValueOneOf "UseNTP" boolValues) + (assertValueOneOf "UseSIP" boolValues) (assertValueOneOf "SendHostname" boolValues) (assertValueOneOf "UseHostname" boolValues) (assertValueOneOf "UseDomains" (boolValues ++ [ "route" ]))