diff options
author | James Rayner <james@archlinux.org> | 2009-09-27 15:45:41 +0200 |
---|---|---|
committer | James Rayner <james@archlinux.org> | 2009-09-27 15:45:41 +0200 |
commit | df2c2b5c04393ed72c2798407f50f99a6298b673 (patch) | |
tree | c432706c3b31ff5702217ec0d16edb4ecae11b0b | |
parent | 818dacfa7f435e42fe1c81ae002a8df01ea80677 (diff) | |
download | netctl-df2c2b5c04393ed72c2798407f50f99a6298b673.tar.gz netctl-df2c2b5c04393ed72c2798407f50f99a6298b673.tar.xz |
Rename autowifi->wpa_actiond, add makefile, bugfix
-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | src/8021x | 4 | ||||
-rwxr-xr-x | wpa_actiond/netcfg-wpa_actiond (renamed from autowifi/autowifi-netcfg) | 4 | ||||
-rwxr-xr-x | wpa_actiond/netcfg-wpa_actiond-action (renamed from autowifi/autowifi-netcfg-action) | 0 |
4 files changed, 5 insertions, 4 deletions
@@ -22,6 +22,7 @@ install: # 'Binaries' install -m755 src/netcfg $(DESTDIR)/usr/bin/netcfg2 install -m755 src/netcfg-menu $(DESTDIR)/usr/bin/netcfg-menu + install -m755 wpa_actiond/netcfg-wpa_actiond{,-action} $(DESTDIR)/usr/bin # Daemons install -m755 src/net-profiles src/net-rename $(DESTDIR)/etc/rc.d @@ -64,14 +64,14 @@ make_wpa_config_file() { # Requires already loaded profile make_wpa_config() { case $SECURITY in - wep) + wep|wep-old) if [[ ${KEY:0:2} == "s:" ]]; then # TODO: does wpa_supplicant handle this as expected? echo "ssid=\"$ESSID\" \nkey_mgmt=NONE \nwep_key0=\"${KEY:2}\" \nwep_tx_keyidx=0" else echo "ssid=\"$ESSID\" \nkey_mgmt=NONE \nwep_key0=$KEY \nwep_tx_keyidx=0" fi ;; - none) + none|none-old) echo "ssid=\"$ESSID\" \nkey_mgmt=NONE" ;; wpa) diff --git a/autowifi/autowifi-netcfg b/wpa_actiond/netcfg-wpa_actiond index f2dc266..02901c6 100755 --- a/autowifi/autowifi-netcfg +++ b/wpa_actiond/netcfg-wpa_actiond @@ -5,8 +5,8 @@ interface=$1; shift -AUTOWIFI="/usr/sbin/autowifi" -ACTION_SCRIPT="/usr/bin/autowifi-netcfg-action" +AUTOWIFI="/usr/sbin/wpa_actiond" +ACTION_SCRIPT="/usr/bin/netcfg-wpa_actiond-action" PIDFILE="/var/run/wpa_supplicant_${interface}.pid" EXTRA_AUTOWIFI_OPTIONS="$*" diff --git a/autowifi/autowifi-netcfg-action b/wpa_actiond/netcfg-wpa_actiond-action index f273b3b..f273b3b 100755 --- a/autowifi/autowifi-netcfg-action +++ b/wpa_actiond/netcfg-wpa_actiond-action |