Merge pull request #93813 from bobismijnnaam/update-wpa-supplicant-config

Ensure wpa_supplicant.conf is written when userControlled and extraConfig are used
This commit is contained in:
Silvan Mosberger 2020-07-26 16:43:56 +02:00 committed by GitHub
commit ff5bdca1ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -4,7 +4,7 @@ with lib;
let let
cfg = config.networking.wireless; 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 '' ${optionalString cfg.userControlled.enable ''
ctrl_interface=DIR=/run/wpa_supplicant GROUP=${cfg.userControlled.group} ctrl_interface=DIR=/run/wpa_supplicant GROUP=${cfg.userControlled.group}
update_config=1''} update_config=1''}