about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorBob Rubbens <bobrubbens@gmail.com>2020-07-25 14:15:20 +0200
committerBob Rubbens <bobrubbens@gmail.com>2020-07-25 14:24:57 +0200
commit71ea6a9a41f1340e6821812f8b7e331072dbd020 (patch)
tree59be87b5a8e1342ceb993984ea00f5fb3cf6e791 /nixos
parentfdbae69e8ce4cf3bfe2c39713586cbea270a608c (diff)
nixos/wpa_supplicant: update config generation
Ensure wpa_supplicant.conf is also generated when userControlled and
extraConfig are used. (As discussed in issue #59959)
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/networking/wpa_supplicant.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index a7dea95056a0e..08a17d20ed7fd 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
   cfg = config.networking.wireless;
-  configFile = if cfg.networks != {} then pkgs.writeText "wpa_supplicant.conf" ''
+  configFile = if cfg.networks != {} || cfg.extraConfig != "" || cfg.userControlled.enable then pkgs.writeText "wpa_supplicant.conf" ''
     ${optionalString cfg.userControlled.enable ''
       ctrl_interface=DIR=/run/wpa_supplicant GROUP=${cfg.userControlled.group}
       update_config=1''}