diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-11-25 16:32:54 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-11-25 16:32:54 +0000 |
| commit | 8eba736da9e6d7ff389554c3f6e0ca5ac089e3ee (patch) | |
| tree | 5bf93ac9389272d9d947ef252ba643f8fba3a609 /modules/services/networking/wpa_supplicant.nix | |
| parent | 1d5d7036d0119fa348039e7b2b745c8f4b7e0f4a (diff) | |
| download | nixpkgs-8eba736da9e6d7ff389554c3f6e0ca5ac089e3ee.tar nixpkgs-8eba736da9e6d7ff389554c3f6e0ca5ac089e3ee.tar.gz nixpkgs-8eba736da9e6d7ff389554c3f6e0ca5ac089e3ee.tar.bz2 nixpkgs-8eba736da9e6d7ff389554c3f6e0ca5ac089e3ee.tar.lz nixpkgs-8eba736da9e6d7ff389554c3f6e0ca5ac089e3ee.tar.xz nixpkgs-8eba736da9e6d7ff389554c3f6e0ca5ac089e3ee.tar.zst nixpkgs-8eba736da9e6d7ff389554c3f6e0ca5ac089e3ee.zip | |
* Use the ‘path’ attribute in Upstart jobs in more places. It's a bit
more readable (also in "ps" output). svn path=/nixos/trunk/; revision=30565
Diffstat (limited to 'modules/services/networking/wpa_supplicant.nix')
| -rw-r--r-- | modules/services/networking/wpa_supplicant.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix index a349a721b12..547280931c9 100644 --- a/modules/services/networking/wpa_supplicant.nix +++ b/modules/services/networking/wpa_supplicant.nix @@ -48,6 +48,8 @@ in { startOn = "started network-interfaces"; stopOn = "stopping network-interfaces"; + path = [ pkgs.wpa_supplicant ]; + preStart = '' touch -a ${configFile} @@ -55,8 +57,7 @@ in ''; exec = - "${pkgs.wpa_supplicant}/sbin/wpa_supplicant " + - "-s -C /var/run/wpa_supplicant " + + "wpa_supplicant -s -C /var/run/wpa_supplicant " + "-c ${configFile} -i${config.networking.WLANInterface}"; }; |