diff options
| author | Jim Pryor <profjim@jimpryor.net> | 2009-09-14 05:43:41 +0200 |
|---|---|---|
| committer | James Rayner <james@archlinux.org> | 2009-09-14 08:24:48 +0200 |
| commit | 06f6fab07786329be1d4b03a09c5af177cadd609 (patch) | |
| tree | bd9cb2c57963cc77cd1e68701fe6bd3d3567f448 /src/connections | |
| parent | f2da81ef36dcce8cfd4b841ca1677e744818b3be (diff) | |
| download | netctl-06f6fab07786329be1d4b03a09c5af177cadd609.tar.gz netctl-06f6fab07786329be1d4b03a09c5af177cadd609.tar.xz | |
revert regexp ESSID patches
Signed-off-by: Jim Pryor <profjim@jimpryor.net>
Diffstat (limited to 'src/connections')
| -rw-r--r-- | src/connections/wireless | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/connections/wireless b/src/connections/wireless index 955f957..42504d2 100644 --- a/src/connections/wireless +++ b/src/connections/wireless @@ -5,7 +5,6 @@ wireless_up() { load_profile "$1" - [[ -n "$2" ]] && ESSID="$2" # JP: use the literal ESSID (though currently we only interpret wireless-dbus ESSIDs as regexps) . "$SUBR_DIR/8021x" . "$SUBR_DIR/wireless" @@ -64,8 +63,7 @@ wireless_up() { if [[ -n "$AP" ]]; then ESSID=$(find_ap "$INTERFACE" "$AP") else - ESSID=$(find_essid "$INTERFACE" "$ESSID" "$CONNECTION") # JP: we could have left $3 null for default of treating ESSID as literal - # but instead we explicitly pass $CONNECTION + ESSID=$(find_essid "$INTERFACE" "$ESSID") fi if [[ $? -gt 0 ]]; then report_fail "Wireless network \"$OLDESSID\" not present." |