summary refs log tree commit diff
path: root/nixos/modules/system/boot/networkd.nix
diff options
context:
space:
mode:
authorVincent Haupert <mail@vincent-haupert.de>2022-10-09 00:14:53 +0200
committerVincent Haupert <mail@vincent-haupert.de>2022-10-09 00:21:05 +0200
commit036489ffaa477774a0cfad0377598aaf3120aa58 (patch)
tree208d6335511bd4a2dbe7fa653b0616441f0c2722 /nixos/modules/system/boot/networkd.nix
parentbc8d6d8f968fcc37b6495526b805e0de18f9f849 (diff)
downloadnixpkgs-036489ffaa477774a0cfad0377598aaf3120aa58.tar
nixpkgs-036489ffaa477774a0cfad0377598aaf3120aa58.tar.gz
nixpkgs-036489ffaa477774a0cfad0377598aaf3120aa58.tar.bz2
nixpkgs-036489ffaa477774a0cfad0377598aaf3120aa58.tar.lz
nixpkgs-036489ffaa477774a0cfad0377598aaf3120aa58.tar.xz
nixpkgs-036489ffaa477774a0cfad0377598aaf3120aa58.tar.zst
nixpkgs-036489ffaa477774a0cfad0377598aaf3120aa58.zip
nixos/networkd: adapt `dhcpV6Config`
* Remove `ForceDHCPv6PDOtherInformation=`
* Add a missing `WithoutRA=` option

Systemd 250:

> The ForceDHCPv6PDOtherInformation= setting in the [DHCPv6] section
> has been removed. Please use the WithoutRA= and UseDelegatedPrefix=
> settings in the [DHCPv6] section and the DHCPv6Client= setting in the
> [IPv6AcceptRA] section to control when the DHCPv6 client is started
> and how the delegated prefixes are handled by the DHCPv6 client.
Diffstat (limited to 'nixos/modules/system/boot/networkd.nix')
-rw-r--r--nixos/modules/system/boot/networkd.nix4
1 files changed, 1 insertions, 3 deletions
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 7b6739e62d6..ad6c95257ad 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -745,7 +745,6 @@ let
           "MUDURL"
           "RequestOptions"
           "SendVendorOption"
-          "ForceDHCPv6PDOtherInformation"
           "PrefixDelegationHint"
           "WithoutRA"
           "SendOption"
@@ -760,8 +759,7 @@ let
         (assertValueOneOf "UseNTP" boolValues)
         (assertInt "RouteMetric")
         (assertValueOneOf "RapidCommit" boolValues)
-        (assertValueOneOf "ForceDHCPv6PDOtherInformation" boolValues)
-        (assertValueOneOf "WithoutRA" ["solicit" "information-request"])
+        (assertValueOneOf "WithoutRA" ["no" "solicit" "information-request"])
         (assertRange "SendOption" 1 65536)
         (assertInt "IAID")
       ];