diff options
| author | Robin Gloster <mail@glob.in> | 2015-12-26 01:09:00 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2015-12-29 18:49:38 +0000 |
| commit | 57210ce1c10b761696941d830ccb6d7f7846c449 (patch) | |
| tree | 2cdb10ee84e083eea062183dacdf07080dcb05ea /nixos/modules | |
| parent | 2c9369dc439ef7e68ed4839b16dad0d2d7628b96 (diff) | |
| download | nixpkgs-57210ce1c10b761696941d830ccb6d7f7846c449.tar nixpkgs-57210ce1c10b761696941d830ccb6d7f7846c449.tar.gz nixpkgs-57210ce1c10b761696941d830ccb6d7f7846c449.tar.bz2 nixpkgs-57210ce1c10b761696941d830ccb6d7f7846c449.tar.lz nixpkgs-57210ce1c10b761696941d830ccb6d7f7846c449.tar.xz nixpkgs-57210ce1c10b761696941d830ccb6d7f7846c449.tar.zst nixpkgs-57210ce1c10b761696941d830ccb6d7f7846c449.zip | |
wpa_supplicant module: remove obsolete option
networking.WLANInterface has been obsolete for years
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/networking/wpa_supplicant.nix | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 9e04bd40190..bef4b2bc0b9 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -3,14 +3,8 @@ with lib; let - cfg = config.networking.wireless; configFile = "/etc/wpa_supplicant.conf"; - - ifaces = - cfg.interfaces ++ - optional (config.networking.WLANInterface != "") config.networking.WLANInterface; - in { @@ -18,12 +12,6 @@ in ###### interface options = { - - networking.WLANInterface = mkOption { - default = ""; - description = "Obsolete. Use <option>networking.wireless.interfaces</option> instead."; - }; - networking.wireless = { enable = mkOption { type = types.bool; @@ -95,8 +83,9 @@ in services.dbus.packages = [ pkgs.wpa_supplicant ]; # FIXME: start a separate wpa_supplicant instance per interface. - jobs.wpa_supplicant = - { description = "WPA Supplicant"; + jobs.wpa_supplicant = let + ifaces = cfg.interfaces; + in { description = "WPA Supplicant"; wantedBy = [ "network.target" ]; |