diff options
author | Robin Gloster <mail@glob.in> | 2015-12-26 01:12:32 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2015-12-29 18:49:39 +0000 |
commit | 9dceabc95dfefc01cef566ffa463c7731da88180 (patch) | |
tree | 4aa8693b51c411af7275a58a42d23fa37493a580 | |
parent | 57210ce1c10b761696941d830ccb6d7f7846c449 (diff) | |
download | nixlib-9dceabc95dfefc01cef566ffa463c7731da88180.tar nixlib-9dceabc95dfefc01cef566ffa463c7731da88180.tar.gz nixlib-9dceabc95dfefc01cef566ffa463c7731da88180.tar.bz2 nixlib-9dceabc95dfefc01cef566ffa463c7731da88180.tar.lz nixlib-9dceabc95dfefc01cef566ffa463c7731da88180.tar.xz nixlib-9dceabc95dfefc01cef566ffa463c7731da88180.tar.zst nixlib-9dceabc95dfefc01cef566ffa463c7731da88180.zip |
wpa_supplicant module: refactor
-rw-r--r-- | nixos/modules/services/networking/wpa_supplicant.nix | 75 |
1 files changed, 32 insertions, 43 deletions
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index bef4b2bc0b99..5979ab7fbe33 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -5,12 +5,7 @@ with lib; let cfg = config.networking.wireless; configFile = "/etc/wpa_supplicant.conf"; -in - -{ - - ###### interface - +in { options = { networking.wireless = { enable = mkOption { @@ -73,19 +68,17 @@ in }; }; + config = mkMerge [ + (mkIf cfg.enable { + environment.systemPackages = [ pkgs.wpa_supplicant ]; - ###### implementation - - config = mkIf cfg.enable { - - 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. - jobs.wpa_supplicant = let - ifaces = cfg.interfaces; - in { description = "WPA Supplicant"; + # FIXME: start a separate wpa_supplicant instance per interface. + systemd.services.wpa_supplicant = let + ifaces = cfg.interfaces; + in { + description = "WPA Supplicant"; wantedBy = [ "network.target" ]; @@ -101,37 +94,33 @@ in fi ''; - script = - '' - ${if ifaces == [] then '' - for i in $(cd /sys/class/net && echo *); do - DEVTYPE= - source /sys/class/net/$i/uevent - if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then - ifaces="$ifaces''${ifaces:+ -N} -i$i" - fi - done - '' else '' - ifaces="${concatStringsSep " -N " (map (i: "-i${i}") ifaces)}" - ''} - exec wpa_supplicant -s -u -D${cfg.driver} -c ${configFile} $ifaces - ''; + script = '' + ${if ifaces == [] then '' + for i in $(cd /sys/class/net && echo *); do + DEVTYPE= + source /sys/class/net/$i/uevent + if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then + ifaces="$ifaces''${ifaces:+ -N} -i$i" + fi + done + '' else '' + ifaces="${concatStringsSep " -N " (map (i: "-i${i}") ifaces)}" + ''} + exec wpa_supplicant -s -u -D${cfg.driver} -c ${configFile} $ifaces + ''; }; - powerManagement.resumeCommands = - '' + powerManagement.resumeCommands = '' ${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. - services.udev.extraRules = - '' + # Restart wpa_supplicant when a wlan device appears or disappears. + services.udev.extraRules = '' 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 ]; + } + ]; } |