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

wpa_supplicant module: refactor

Browse Source
This commit is contained in:
Robin Gloster 2015-12-26 01:12:32 +00:00
parent 7d973a56d0
commit 3a5f488445
1 changed files with 32 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,12 +5,7 @@ with lib;
let let
cfg = config.networking.wireless; cfg = config.networking.wireless;
configFile = "/etc/wpa_supplicant.conf"; configFile = "/etc/wpa_supplicant.conf";
in in {
{
###### interface
options = { options = {
networking.wireless = { networking.wireless = {
enable = mkOption { enable = mkOption {
@ -73,19 +68,17 @@ in
}; };
}; };
config = mkMerge [
###### implementation (mkIf cfg.enable {
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.wpa_supplicant ]; environment.systemPackages = [ pkgs.wpa_supplicant ];
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 = let systemd.services.wpa_supplicant = let
ifaces = cfg.interfaces; ifaces = cfg.interfaces;
in { description = "WPA Supplicant"; in {
description = "WPA Supplicant";
wantedBy = [ "network.target" ]; wantedBy = [ "network.target" ];
@ -101,8 +94,7 @@ in
fi fi
''; '';
script = script = ''
''
${if ifaces == [] then '' ${if ifaces == [] then ''
for i in $(cd /sys/class/net && echo *); do for i in $(cd /sys/class/net && echo *); do
DEVTYPE= DEVTYPE=
@ -118,20 +110,17 @@ in
''; '';
}; };
powerManagement.resumeCommands = powerManagement.resumeCommands = ''
''
${config.systemd.package}/bin/systemctl try-restart wpa_supplicant ${config.systemd.package}/bin/systemctl try-restart wpa_supplicant
''; '';
assertions = [{ assertion = !cfg.userControlled.enable || cfg.interfaces != [];
message = "user controlled wpa_supplicant needs explicit networking.wireless.interfaces";}];
# Restart wpa_supplicant when a wlan device appears or disappears. # Restart wpa_supplicant when a wlan device appears or disappears.
services.udev.extraRules = services.udev.extraRules = ''
''
ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", RUN+="${config.systemd.package}/bin/systemctl try-restart wpa_supplicant.service" ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", RUN+="${config.systemd.package}/bin/systemctl try-restart wpa_supplicant.service"
''; '';
})
}; {
meta.maintainers = with lib.maintainers; [ globin ];
}
];
} }