Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure wpa_supplicant.conf is written when userControlled and extraConfig are used #93813

Merged
merged 1 commit into from Jul 26, 2020

Conversation

bobismijnnaam
Copy link
Contributor

@bobismijnnaam bobismijnnaam commented Jul 25, 2020

Motivation for this change

Issue #59959 shows that wpa_supplicant.conf is only generated if the user specifies networks. However, it should also be generated if either extraConfig or userControlled is specified. This PR adds that.

Things done

Testing this change locally is underway. I have a hard time figuring out how to test this change without booting my system from nixpkgs/master. But if that's needed I can try. I applied the patch to the release-20.03 branch, booted my install off of it, and it worked as expected locally (that is: wpa_cli enters an interactive prompt with only userControlled = true in my configuration.nix).

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Ensure wpa_supplicant.conf is also generated when userControlled and
extraConfig are used. (As discussed in issue NixOS#59959)
Copy link
Member

@infinisil infinisil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good to me. This technically isn't backwards compatible for people that have no networks specified but do have userControlled.enable or extraConfig specified. But I don't think this is a big problem because these settings didn't have an effect in this case before this change.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants