diff options
| author | Jouke Witteveen <j.witteveen@gmail.com> | 2013-04-15 19:12:50 +0200 |
|---|---|---|
| committer | Jouke Witteveen <j.witteveen@gmail.com> | 2013-04-15 19:12:50 +0200 |
| commit | 494ac0bd090df5f33f2e62fe41ecd58ed9422461 (patch) | |
| tree | 6bdefdcc05a7b6c52567a5f60590526355a5a55c /src | |
| parent | 748fed60e3c4950b431d5d3c4fae70cb1cc59d4c (diff) | |
| download | netctl-494ac0bd090df5f33f2e62fe41ecd58ed9422461.tar.gz netctl-494ac0bd090df5f33f2e62fe41ecd58ed9422461.tar.xz | |
Fix naming of IEEE 802 working groups
Use 'wpa' to refer to the 802.11i and 802.1x client side software
(wpa_supplicant) in general.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/connections/ethernet | 10 | ||||
| -rw-r--r-- | src/lib/connections/wireless | 2 | ||||
| -rw-r--r-- | src/lib/wpa (renamed from src/lib/8021x) | 0 | ||||
| -rwxr-xr-x | src/netctl-auto | 2 | ||||
| -rwxr-xr-x | src/wifi-menu | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/connections/ethernet b/src/lib/connections/ethernet index 6cc2c12..dfd0117 100644 --- a/src/lib/connections/ethernet +++ b/src/lib/connections/ethernet @@ -30,7 +30,7 @@ ethernet_up() { if is_yes "${Auth8021X:-no}"; then - . "$SUBR_DIR/8021x" + . "$SUBR_DIR/wpa" : ${WPAConfigFile:=/etc/wpa_supplicant.conf} : ${WPADriver:=wired} : ${TimeoutWPA:=15} @@ -50,7 +50,7 @@ ethernet_up() { fi if ! ip_set; then - stop_80211x + stop_8021x bring_interface_down "$Interface" return 1 fi @@ -58,14 +58,14 @@ ethernet_up() { ethernet_down() { ip_unset - stop_80211x + stop_8021x bring_interface_down "$Interface" } # Stop wpa_supplicant if neccessary -stop_80211x() { +stop_8021x() { if is_yes "${Auth8021X:-no}"; then - . "$SUBR_DIR/8021x" + . "$SUBR_DIR/wpa" : ${WPAConfigFile:=/etc/wpa_supplicant.conf} do_debug wpa_stop "$Interface" fi diff --git a/src/lib/connections/wireless b/src/lib/connections/wireless index 6444c4c..fe01b90 100644 --- a/src/lib/connections/wireless +++ b/src/lib/connections/wireless @@ -1,7 +1,7 @@ # Wireless connection support for netctl -. "$SUBR_DIR/8021x" . "$SUBR_DIR/ip" +. "$SUBR_DIR/wpa" . "$SUBR_DIR/rfkill" diff --git a/src/lib/8021x b/src/lib/wpa index 65ef8f9..65ef8f9 100644 --- a/src/lib/8021x +++ b/src/lib/wpa diff --git a/src/netctl-auto b/src/netctl-auto index 7590110..ea692ca 100755 --- a/src/netctl-auto +++ b/src/netctl-auto @@ -1,7 +1,7 @@ #! /bin/bash . /usr/lib/network/globals -. "$SUBR_DIR/8021x" +. "$SUBR_DIR/wpa" . "$SUBR_DIR/rfkill" : ${ACTIOND:=wpa_actiond -p /run/wpa_supplicant} diff --git a/src/wifi-menu b/src/wifi-menu index 2716d68..188f6c7 100755 --- a/src/wifi-menu +++ b/src/wifi-menu @@ -1,7 +1,7 @@ #! /bin/bash . /usr/lib/network/globals -. "$SUBR_DIR/8021x" +. "$SUBR_DIR/wpa" usage() |