diff options
| author | Rémy Oudompheng <remy@archlinux.org> | 2011-08-09 00:27:53 +0200 |
|---|---|---|
| committer | Rémy Oudompheng <remy@archlinux.org> | 2011-08-09 00:27:53 +0200 |
| commit | 8dec3ca378062e538dd97eba1712338bbebc8f33 (patch) | |
| tree | 3791de47b4d5411b6989b71894b3221222a24f11 /wpa_actiond | |
| parent | 82561d179d239bd7c3305e81fa62f01928fb390e (diff) | |
| parent | 0b6ac7bf41ef2f1cf548eda8a4054c21a4bd9434 (diff) | |
| download | netctl-8dec3ca378062e538dd97eba1712338bbebc8f33.tar.gz netctl-8dec3ca378062e538dd97eba1712338bbebc8f33.tar.xz | |
Merge branch '2.6.x'
Conflicts:
README
Diffstat (limited to 'wpa_actiond')
| -rwxr-xr-x | wpa_actiond/netcfg-wpa_actiond | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/wpa_actiond/netcfg-wpa_actiond b/wpa_actiond/netcfg-wpa_actiond index 3bbb9fc..9ad319f 100755 --- a/wpa_actiond/netcfg-wpa_actiond +++ b/wpa_actiond/netcfg-wpa_actiond @@ -51,10 +51,14 @@ fi WPA_CONF="$(make_wpa_config_file $interface)" -for profile in ${AUTO_PROFILES:-$(list_profiles)}; do - echo $profile +if [[ -n "${AUTO_PROFILES}" ]]; then + for prof in ${AUTO_PROFILES}; do echo $prof; done +else + list_profiles +fi | while read profile; do + echo "$profile" ( - load_profile $profile + load_profile "$profile" [[ $CONNECTION != "wireless" ]] && exit 1 [[ $INTERFACE != $interface ]] && exit 1 |