public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wpa_supplicant module: remove obsolete option

Browse Source 
networking.WLANInterface has been obsolete for years
This commit is contained in:
Robin Gloster 2015-12-26 01:09:00 +00:00
parent 2ee6396bf7
commit 7d973a56d0
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nixos/modules/services/networking/wpa_supplicant.nix
View File

@ -3,14 +3,8 @@
with lib; with lib;
let let
cfg = config.networking.wireless; cfg = config.networking.wireless;
configFile = "/etc/wpa_supplicant.conf"; configFile = "/etc/wpa_supplicant.conf";
ifaces =
cfg.interfaces ++
optional (config.networking.WLANInterface != "") config.networking.WLANInterface;
in in
{ {
@ -18,12 +12,6 @@ in
###### interface ###### interface
options = { options = {
networking.WLANInterface = mkOption {
default = "";
description = "Obsolete. Use <option>networking.wireless.interfaces</option> instead.";
};
networking.wireless = { networking.wireless = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
@ -95,8 +83,9 @@ in
services.dbus.packages = [ pkgs.wpa_supplicant ]; services.dbus.packages = [ pkgs.wpa_supplicant ];
# FIXME: start a separate wpa_supplicant instance per interface. # FIXME: start a separate wpa_supplicant instance per interface.
jobs.wpa_supplicant = jobs.wpa_supplicant = let
{ description = "WPA Supplicant"; ifaces = cfg.interfaces;
in { description = "WPA Supplicant";
wantedBy = [ "network.target" ]; wantedBy = [ "network.target" ];