diff options
| author | P. J. McDermott <pj@pehjota.net> | 2014-08-08 14:38:28 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pj@pehjota.net> | 2014-08-08 14:38:28 (EDT) |
| commit | 95e5d03f260b7a97616a1e8f825edfc3bd913345 (patch) | |
| tree | 4c978c79fd216ec3d5dfeefee059517dda217c63 | |
| parent | e8f437d3754cda3f7e4de6d32ce3f1dd16e69959 (diff) | |
ifupdown: Support multiple wpa_supplicant procs
| -rwxr-xr-x | ifupdown/if-down | 3 | ||||
| -rwxr-xr-x | ifupdown/if-pre-up | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ifupdown/if-down b/ifupdown/if-down index 6915ade..224d97b 100755 --- a/ifupdown/if-down +++ b/ifupdown/if-down @@ -4,7 +4,8 @@ set -eu if [ "x${IFACE#wlan}" != "x${IFACE}" ]; then if [ -f "/var/run/wpa_supplicant.${IFACE}.conf" ]; then - wpa_cli -p/var/run/wpa_supplicant -i${IFACE} terminate + wpa_cli -p"/var/run/wpa_supplicant.${IFACE}" -i${IFACE} \ + terminate rm "/var/run/wpa_supplicant.${IFACE}.conf" fi fi diff --git a/ifupdown/if-pre-up b/ifupdown/if-pre-up index 73aba1b..d3f17f4 100755 --- a/ifupdown/if-pre-up +++ b/ifupdown/if-pre-up @@ -37,7 +37,8 @@ get_iface_opts() wpa_opts_start_cb() { exec 3>"/var/run/wpa_supplicant.${IFACE}.conf" - printf 'ctrl_interface=DIR=/var/run/wpa_supplicant\ncountry=US\n\n' >&3 + printf 'ctrl_interface=DIR=/var/run/wpa_supplicant.%s\ncountry=US\n\n' \ + "${IFACE}" >&3 printf 'network={\n' >&3 } |