From 4d80e053525f937b3eb76d9d2072895a826f53d6 Mon Sep 17 00:00:00 2001 From: James Rayner Date: Wed, 23 Sep 2009 23:55:04 +1000 Subject: Add WPA_DRIVER, WPA_COUNTRY and handle WEP string keys WPA_DRVER: Configure the -D argument to wpa_supplicant, for example -Dnl80211 WPA_COUNTRY: Set the 'country=' variable in the wpa_supplicant configuration. WEP string keys: modified such that they may work. Not tested yet. --- src/connections/ethernet | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/connections/ethernet') diff --git a/src/connections/ethernet b/src/connections/ethernet index 1775247..20ee545 100644 --- a/src/connections/ethernet +++ b/src/connections/ethernet @@ -31,10 +31,10 @@ ethernet_up() { if checkyesno "${AUTH8021X:-no}"; then . "$SUBR_DIR/8021x" [[ -z "$WPA_CONF" ]] && WPA_CONF="/etc/wpa_supplicant.conf" - [[ -z "$WPA_OPTS" ]] && WPA_OPTS="-Dwired" + [[ -z "$WPA_DRIVER" ]] && WPA_DRIVER="wired" - report_debug ethernet_iproute_up start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_OPTS" - if ! start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_OPTS"; then + report_debug ethernet_iproute_up start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_DRIVER" "$WPA_OPTS" + if ! start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_DRIVER" "$WPA_OPTS"; then report_fail "wpa_supplicant did not start, possible configuration error" return 1 fi -- cgit v1.2.3-24-g4f1b