diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-04-24 21:46:43 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-04-24 21:46:43 +0000 |
| commit | 1155fe22f750d0ee446b6a729cd574c2b068e480 (patch) | |
| tree | f8e627a8b46516aae094b2d5b953891a253f68df /perl-install/network/netconnect.pm | |
| parent | 5c0448ea44d1b03b528fd8d378062037640b5153 (diff) | |
| download | drakx-1155fe22f750d0ee446b6a729cd574c2b068e480.tar drakx-1155fe22f750d0ee446b6a729cd574c2b068e480.tar.gz drakx-1155fe22f750d0ee446b6a729cd574c2b068e480.tar.bz2 drakx-1155fe22f750d0ee446b6a729cd574c2b068e480.tar.xz drakx-1155fe22f750d0ee446b6a729cd574c2b068e480.zip | |
handle errors in wireless packages installation, simplify
Diffstat (limited to 'perl-install/network/netconnect.pm')
| -rw-r--r-- | perl-install/network/netconnect.pm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index d3cb57b5c..b753de5e2 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -1277,6 +1277,14 @@ See iwpriv(8) man page for further information."), $in->ask_warn(N("Error"), N("Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add enough '0' (zeroes).")); return 1, 8; } + if (network::wireless::wlan_ng_needed($module) && !$in->do_pkgs->ensure_is_installed('prism2-utils', '/sbin/wlanctl-ng')) { + $in->ask_warn(N("Error"), N("Could not install the %s package!", 'prism2-utils')); + return 1; + } + if ($wireless_enc_mode eq 'wpa-psk' && !$in->do_pkgs->ensure_is_installed('wpa_supplicant', '/usr/sbin/wpa_supplicant')) { + $in->ask_warn(N("Error"), N("Could not install the %s package!", 'wpa_supplicant')); + return 1; + } }, post => sub { if ($wireless_enc_mode eq 'none') { @@ -1287,11 +1295,11 @@ See iwpriv(8) man page for further information."), } 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); + network::wireless::wpa_supplicant_configure($ethntf->{WIRELESS_ESSID}, $wireless_enc_key); } else { delete $ethntf->{WIRELESS_WPA_DRIVER}; } - $module =~ /^prism2_/ and network::wireless::wlan_ng_configure($in, $ethntf, $module); + network::wireless::wlan_ng_needed($module) and network::wireless::wlan_ng_configure($ethntf->{WIRELESS_ESSID}, $wireless_enc_key, $ethntf->{DEVICE}, $module); return "static_hostname"; }, }, |