summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Rayner <james@archlinux.org>2010-02-21 06:35:14 +0100
committerJames Rayner <james@archlinux.org>2010-02-21 06:35:14 +0100
commit781798501379645e0df2e280cc786ba37a2d61c9 (patch)
treeb880483b8c31f624c72f88bc4662e1ea6e8921ac
parentbf160d1b92e4d9330a800c618c4a455cf7c667fd (diff)
downloadnetctl-781798501379645e0df2e280cc786ba37a2d61c9.tar.gz
netctl-781798501379645e0df2e280cc786ba37a2d61c9.tar.xz
Handle undefined SECURITY, set example to be explicit
-rw-r--r--examples/wireless-open1
-rwxr-xr-xwpa_actiond/netcfg-wpa_actiond1
2 files changed, 2 insertions, 0 deletions
diff --git a/examples/wireless-open b/examples/wireless-open
index ef68bd9..a2b3d27 100644
--- a/examples/wireless-open
+++ b/examples/wireless-open
@@ -1,5 +1,6 @@
CONNECTION="wireless"
DESCRIPTION="A simple opened wireless connection"
INTERFACE="wlan0"
+SECURITY="none"
ESSID="MyNetwork"
IP="dhcp"
diff --git a/wpa_actiond/netcfg-wpa_actiond b/wpa_actiond/netcfg-wpa_actiond
index ea0945f..84a622d 100755
--- a/wpa_actiond/netcfg-wpa_actiond
+++ b/wpa_actiond/netcfg-wpa_actiond
@@ -53,6 +53,7 @@ for profile in $(list_profiles); do
[[ $CONNECTION != "wireless" ]] && exit 1
[[ $INTERFACE != $interface ]] && exit 1
# Exclude wpa-config, the wpa_conf is 'complete' and doesn't fit in this scheme
+ [[ -z "$SECURITY" ]] && SECURITY="none"
[[ $SECURITY == "wpa-config" ]] && exit 1
config=$(make_wpa_config)