Rename autowifi->wpa_actiond, add makefile, bugfix

4 files changed, 5 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index d350c89..ab6bfbd 100644
--- a/Makefile
+++ b/Makefile
@@ -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
 
diff --git a/src/8021x b/src/8021x
index 6184da3..ce4fbf2 100644
--- a/src/8021x
+++ b/src/8021x
@@ -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