Author: urkud
Date: Mon Dec 19 23:16:32 2011
New Revision: 30972
URL: https://nixos.org/websvn/nix/?rev=30972&sc=1
Log:
wpa_supplicant: add D-Bus interface
Modified:
nixos/trunk/modules/services/networking/wpa_supplicant.nix
Modified: nixos/trunk/modules/services/networking/wpa_supplicant.nix
==============================================================================
--- nixos/trunk/modules/services/networking/wpa_supplicant.nix Mon Dec 19
21:15:17 2011 (r30971)
+++ nixos/trunk/modules/services/networking/wpa_supplicant.nix Mon Dec 19
23:16:32 2011 (r30972)
@@ -44,6 +44,8 @@
environment.systemPackages = [ pkgs.wpa_supplicant ];
+ services.dbus.packages = [ pkgs.wpa_supplicant ];
+
jobs.wpa_supplicant =
{ startOn = "started network-interfaces";
stopOn = "stopping network-interfaces";
@@ -57,8 +59,8 @@
'';
exec =
- "wpa_supplicant -s -C /var/run/wpa_supplicant " +
- "-c ${configFile} -i${config.networking.WLANInterface}";
+ "wpa_supplicant -s -u -c ${configFile} "
+ + (optionalString (config.networking.WLANInterface != null) "-i
${config.networking.WLANInterface}");
};
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
