Skip to content

Commit 8aa7a07

Browse files
committed
nixos/iwd: move General.UseDefaultInterface to DriverQuirks.DefaultInterface
`General.UseDefaultInterface` was deprecated last year, with a recommendation to move to `DriverQuirks.DefaultInterface` [0] [1] [2]. [0]: https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=5c7777ff0fbcdee3c5d3a3cf6b1f375f2e820644 [1]: https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=d223f49fbc622e5b2f270711619ecbd542bed12e [2]: https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=a27b7823df12c5d185b39aa7777c546843c1c96f
1 parent 8a05ea5 commit 8aa7a07

File tree

1 file changed

+7
-1
lines changed
  • nixos/modules/services/networking

1 file changed

+7
-1
lines changed

nixos/modules/services/networking/iwd.nix

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ let
2020
defaults = {
2121
# without UseDefaultInterface, sometimes wlan0 simply goes AWOL with NetworkManager
2222
# https://iwd.wiki.kernel.org/interface_lifecycle#interface_management_in_iwd
23-
General.UseDefaultInterface =
23+
DriverQuirks.UseDefaultInterface =
2424
with config.networking.networkmanager;
2525
(enable && (wifi.backend == "iwd"));
2626
};
@@ -61,6 +61,12 @@ in
6161
Only one wireless daemon is allowed at the time: networking.wireless.enable and networking.wireless.iwd.enable are mutually exclusive.
6262
'';
6363
}
64+
{
65+
assertion = !(cfg.settings ? General && cfg.settings.General ? UseDefaultInterface);
66+
message = ''
67+
`networking.wireless.iwd.settings.General.UseDefaultInterface` has been deprecated. Use `networking.wireless.iwd.settings.DriverQuirks.UseDefaultInterface` instead.
68+
'';
69+
}
6470
];
6571

6672
environment.etc."iwd/${configFile.name}".source = configFile;

0 commit comments

Comments
 (0)