diff options
| author | Jim Pryor <profjim@jimpryor.net> | 2009-08-11 14:05:10 +0200 |
|---|---|---|
| committer | James Rayner <james@archlinux.org> | 2009-08-15 04:28:29 +0200 |
| commit | 9578dda45b86acf3bd25def5de8f1d51f2ec22b2 (patch) | |
| tree | 214394f032dc086c0c63befc8e22fffc80d16403 /doc | |
| parent | c37f2081157b15be719ce8afb0e8e15afbf24253 (diff) | |
| download | netctl-9578dda45b86acf3bd25def5de8f1d51f2ec22b2.tar.gz netctl-9578dda45b86acf3bd25def5de8f1d51f2ec22b2.tar.xz | |
Add AP argument to profile, also let ESSID arguments be regexps
* AP= arguments in profiles take precedence over ESSID= arguments
* ESSID= arguments regexps instead of literals. To avoid screwing up
any currently working profiles, I restricted the interpretation as a
regexp to just the new wireless-dbus connection types.
* But a global change involved in implementing this is that the
connection up/down calls will be passed a literal ESSID (which of the
local networks matches the regexp) as an additional argument.
Signed-off-by: Jim Pryor <profjim@jimpryor.net>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/wireless | 4 | ||||
| -rw-r--r-- | doc/wireless-dbus | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/doc/wireless b/doc/wireless index 9f8087e..e1f649e 100644 --- a/doc/wireless +++ b/doc/wireless @@ -17,8 +17,10 @@ SECURITY (required for security of 'wep', 'wpa' or 'wpa-config') : One of 'wpa', 'wep', 'none' or 'wpa-config'. Defaults to 'none' KEY (required for SECURITY of 'wpa' or 'wep' only) : Wireless encryption key. -ESSID (required) +ESSID (this or AP is required) : Name of network to connect to. +AP (this or ESSID is required) +: AP of the network to connect to. TIMEOUT (optional) : Time to wait for association. Defaults to 15 seconds. SCAN (optional) diff --git a/doc/wireless-dbus b/doc/wireless-dbus index 918256d..bddd565 100644 --- a/doc/wireless-dbus +++ b/doc/wireless-dbus @@ -15,8 +15,10 @@ SECURITY (required) : One of 'wpa', 'wep', 'none' or 'wpa-config' KEY (required for SECURITY of 'wpa' or 'wep' only) : Wireless encryption key. -ESSID (required) -: Name of network to connect to. +ESSID (this or AP is required) +: Name of network to connect to. Note that for "wireless-dbus" profiles this is always a Gnu regexp (as interpreted by "expr"). +AP (this or ESSID is required) +: AP of the network to connect to. TIMEOUT : Time to wait for association. Defaults to 15 seconds. |