diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-04-19 21:53:43 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-04-19 21:53:43 +0000 |
| commit | a3e5822f3b437f8cf48ca20aa13a7645946ba6a0 (patch) | |
| tree | 7b6bde825309cffdd47c7c36098a813c20ead6db | |
| parent | 5bd6e8d785088e298593845eb6d2d8fdf96c9c99 (diff) | |
| download | drakx-a3e5822f3b437f8cf48ca20aa13a7645946ba6a0.tar drakx-a3e5822f3b437f8cf48ca20aa13a7645946ba6a0.tar.gz drakx-a3e5822f3b437f8cf48ca20aa13a7645946ba6a0.tar.bz2 drakx-a3e5822f3b437f8cf48ca20aa13a7645946ba6a0.tar.xz drakx-a3e5822f3b437f8cf48ca20aa13a7645946ba6a0.zip | |
fix ancient bug (Managed should be the default wireless mode, not Secondary) and simplify
| -rw-r--r-- | perl-install/network/netconnect.pm | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 7ddf3d30e..55df2453b 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -99,13 +99,6 @@ sub real_main { my $config = {}; eval(cat_("$::prefix/etc/sysconfig/drakconnect")); - my %wireless_mode = (N("Ad-hoc") => "Ad-hoc", - N("Managed") => "Managed", - N("Master") => "Master", - N("Repeater") => "Repeater", - N("Secondary") => "Secondary", - N("Auto") => "Auto", - ); my %l10n_lan_protocols = ( static => N("Manual configuration"), dhcp => N("Automatic IP (BOOTP/DHCP)"), @@ -1215,7 +1208,8 @@ notation (for example, 1.2.3.4).")), data => sub { [ { label => N("Operating Mode"), val => \$ethntf->{WIRELESS_MODE}, - list => [ keys %wireless_mode ] }, + list => [ N_("Ad-hoc"), N_("Managed"), N_("Master"), N_("Repeater"), N_("Secondary"), N_("Auto") ], + format => \&translate }, { label => N("Network name (ESSID)"), val => \$ethntf->{WIRELESS_ESSID} }, { label => N("Network ID"), val => \$ethntf->{WIRELESS_NWID}, advanced => 1 }, { label => N("Operating frequency"), val => \$ethntf->{WIRELESS_FREQ}, advanced => 1 }, @@ -1275,8 +1269,6 @@ See iwpriv(8) man page for further information."), } }, post => sub { - # untranslate parameters - $ethntf->{WIRELESS_MODE} = $wireless_mode{$ethntf->{WIRELESS_MODE}}; $module =~ /^prism2_/ and network::wireless::wlan_ng_configure($in, $ethntf, $module); if ($wireless_use_wpa) { $ethntf->{WIRELESS_WPA_DRIVER} = network::wireless::wpa_supplicant_get_driver($module); |