3
0
Fork 0
forked from mirrors/nixpkgs

modules/services/networking/wpa_supplicant.nix: strip trailing whitespace

This commit is contained in:
Peter Simons 2012-06-29 11:53:08 +02:00
parent 61b8ee9029
commit f22dbd5e05

View file

@ -18,7 +18,7 @@ in
###### interface
options = {
networking.WLANInterface = mkOption {
default = "";
description = "Obsolete. Use <option>networking.wireless.interfaces</option> instead.";
@ -82,14 +82,14 @@ in
###### implementation
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.wpa_supplicant ];
services.dbus.packages = [ pkgs.wpa_supplicant ];
jobs.wpa_supplicant =
jobs.wpa_supplicant =
{ startOn = "started network-interfaces";
stopOn = "stopping network-interfaces";
@ -119,13 +119,13 @@ in
exec wpa_supplicant -s -u ${optionalString (cfg.driver != "") "-D${cfg.driver}"} -c ${configFile} $ifaces
'';
};
powerManagement.resumeCommands =
''
${config.system.build.upstart}/sbin/restart wpa_supplicant
'';
assertions = [{ assertion = !cfg.userControlled.enable || cfg.interfaces != [];
assertions = [{ assertion = !cfg.userControlled.enable || cfg.interfaces != [];
message = "user controlled wpa_supplicant needs explicit networking.wireless.interfaces";}];
};