diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-04-24 21:26:54 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-04-24 21:26:54 +0000 |
| commit | 5c0448ea44d1b03b528fd8d378062037640b5153 (patch) | |
| tree | f18aa635b44862abcb63936fb0483aa9f089bdcd | |
| parent | c7c1b99646b12e21fd08cf6ec8a318c6648ed9d7 (diff) | |
| download | drakx-5c0448ea44d1b03b528fd8d378062037640b5153.tar drakx-5c0448ea44d1b03b528fd8d378062037640b5153.tar.gz drakx-5c0448ea44d1b03b528fd8d378062037640b5153.tar.bz2 drakx-5c0448ea44d1b03b528fd8d378062037640b5153.tar.xz drakx-5c0448ea44d1b03b528fd8d378062037640b5153.zip | |
allow to disable WPA even if no key is used
| -rw-r--r-- | perl-install/network/netconnect.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 3dc390015..d3cb57b5c 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -1284,12 +1284,12 @@ See iwpriv(8) man page for further information."), } else { #- keep the key even for WPA, so that drakconnect remembers it $ethntf->{WIRELESS_ENC_KEY} = network::wireless::convert_wep_key_for_iwconfig($wireless_enc_key, $wireless_enc_mode eq 'restricted'); - if ($wireless_enc_mode eq 'wpa-psk') { - $ethntf->{WIRELESS_WPA_DRIVER} = network::wireless::wpa_supplicant_get_driver($module); - network::wireless::wpa_supplicant_configure($in, $ethntf->{WIRELESS_ESSID}, $wireless_enc_key); - } else { - delete $ethntf->{WIRELESS_WPA_DRIVER}; - } + } + if ($wireless_enc_mode eq 'wpa-psk') { + $ethntf->{WIRELESS_WPA_DRIVER} = network::wireless::wpa_supplicant_get_driver($module); + network::wireless::wpa_supplicant_configure($in, $ethntf->{WIRELESS_ESSID}, $wireless_enc_key); + } else { + delete $ethntf->{WIRELESS_WPA_DRIVER}; } $module =~ /^prism2_/ and network::wireless::wlan_ng_configure($in, $ethntf, $module); return "static_hostname"; |