Author: eelco
Date: Tue Apr 10 12:07:30 2012
New Revision: 33717
URL: https://nixos.org/websvn/nix/?rev=33717&sc=1
Log:
* Drop ugly reference to var/run/current-system/sw/sbin/wpa_cli, and
make it conditional.
Modified:
nixos/trunk/modules/services/networking/dhcpcd.nix
nixos/trunk/modules/services/networking/wpa_supplicant.nix
Modified: nixos/trunk/modules/services/networking/dhcpcd.nix
==============================================================================
--- nixos/trunk/modules/services/networking/dhcpcd.nix Tue Apr 10 11:11:05
2012 (r33716)
+++ nixos/trunk/modules/services/networking/dhcpcd.nix Tue Apr 10 12:07:30
2012 (r33717)
@@ -45,7 +45,9 @@
# only works when interface is wireless and wpa_supplicant has a control
socket
# but we allow it to fail silently
- wifiparams=$(/var/run/current-system/sw/sbin/wpa_cli -i$interface status
2>/dev/null | grep ssid | sed 's|^b|B|;s|ssid|SSID|' | xargs)
+ ${optionalString config.networking.wireless.enable ''
+ params+=" $(${pkgs.wpa_supplicant}/sbin/wpa_cli -i$interface status
2>/dev/null | grep ssid | sed 's|^b|B|;s|ssid|SSID|' | xargs)"
+ ''}
if [ "$reason" = BOUND -o "$reason" = REBOOT ]; then
# Restart ntpd. (The "ip-up" event below will trigger the
@@ -56,11 +58,11 @@
# it"), so we silently lose time synchronisation.
${config.system.build.upstart}/sbin/initctl stop ntpd
- ${config.system.build.upstart}/sbin/initctl emit -n ip-up $params
$wifiparams
+ ${config.system.build.upstart}/sbin/initctl emit -n ip-up $params
fi
if [ "$reason" = EXPIRE -o "$reason" = RELEASE -o "$reason" = NOCARRIER
] ; then
- ${config.system.build.upstart}/sbin/initctl emit -n ip-down $params
$wifiparams
+ ${config.system.build.upstart}/sbin/initctl emit -n ip-down $params
fi
'';
Modified: nixos/trunk/modules/services/networking/wpa_supplicant.nix
==============================================================================
--- nixos/trunk/modules/services/networking/wpa_supplicant.nix Tue Apr 10
11:11:05 2012 (r33716)
+++ nixos/trunk/modules/services/networking/wpa_supplicant.nix Tue Apr 10
12:07:30 2012 (r33717)
@@ -126,7 +126,6 @@
assertions = [{ assertion = !cfg.userControlled.enable || cfg.interfaces
!= [];
message = "user controlled wpa_supplicant needs explicit
networking.wireless.interfaces";}];
-
};
}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
