diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2022-06-12 17:07:36 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-06-12 15:56:27 +0000 |
| commit | 5b2ce294d36ae70c6a4ae9840e5cc097e96fb604 (patch) | |
| tree | 4d0403920e4c974cad369fdfb92f219145cb2915 | |
| parent | Merge #177395: metrics job: schedule on a dedicated machine (diff) | |
| download | nixpkgs-5b2ce294d36ae70c6a4ae9840e5cc097e96fb604.tar.gz | |
nixos/wpa_supplicant: don't log that wpa_supplicant.conf is ignored with `allowAuxiliaryImperativeNetworks = true`origin/backport-177415-to-release-22.05
The warning is wrong with `allowAuxiliaryImperativeNetworks`[1] being
set to `true` because both files are included in this case with `-c` and
`-I`.
[1] https://nixos.org/manual/nixos/stable/options.html#opt-networking.wireless.allowAuxiliaryImperativeNetworks
(cherry picked from commit fd2a89b98330f4a06636ef19f34716d68ea7fe71)
| -rw-r--r-- | nixos/modules/services/networking/wpa_supplicant.nix | 2 |
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 c2e1d37e28bf..5a7975ae1782 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -114,7 +114,7 @@ let script = '' - ${optionalString configIsGenerated '' + ${optionalString (configIsGenerated && !cfg.allowAuxiliaryImperativeNetworks) '' if [ -f /etc/wpa_supplicant.conf ]; then echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead." fi |