summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-20 13:26:32 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-20 13:26:32 +0000
commit1b5b9ed35b69c8ce56942b21cd61ec8965a116fe (patch)
treee814c967d1a5ceab04eaea3388ecc19b44da4a04
parentd758d6dbc2481a1c8ec01955d90d16890d6a2afc (diff)
downloaddrakx-1b5b9ed35b69c8ce56942b21cd61ec8965a116fe.tar
drakx-1b5b9ed35b69c8ce56942b21cd61ec8965a116fe.tar.gz
drakx-1b5b9ed35b69c8ce56942b21cd61ec8965a116fe.tar.bz2
drakx-1b5b9ed35b69c8ce56942b21cd61ec8965a116fe.tar.xz
drakx-1b5b9ed35b69c8ce56942b21cd61ec8965a116fe.zip
go to wireless step if needed
-rw-r--r--perl-install/network/netconnect.pm14
1 files changed, 7 insertions, 7 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 966cf5d1d..ca6b17c00 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -592,7 +592,8 @@ notation (for example, 1.2.3.4).")),
$ethntf->{HWADDR} = $track_network_id or delete $ethntf->{HWADDR};
$in->do_pkgs->install($netcnx->{dhcp_client}) if $auto_ip;
- #FIXME "wireless" if $ethntf->{wireless_eth};
+
+ return "wireless" if is_wireless_intf($module);
return "static_hostname";
},
},
@@ -600,12 +601,10 @@ notation (for example, 1.2.3.4).")),
wireless =>
{
pre => sub {
- if (is_wireless_intf($module)) {
- $ethntf->{wireless_eth} = 1;
- $netc->{wireless_eth} = 1;
- $ethntf->{WIRELESS_MODE} = "Managed";
- $ethntf->{WIRELESS_ESSID} = "any";
- }
+ $ethntf->{wireless_eth} = 1;
+ $netc->{wireless_eth} = 1;
+ $ethntf->{WIRELESS_MODE} = "Managed";
+ $ethntf->{WIRELESS_ESSID} = "any";
},
name => N("Please enter the wireless parameters for this card:"),
data => [
@@ -667,6 +666,7 @@ See iwpriv(8) man page for further information."),
post => sub {
# untranslate parameters
$ethntf->{WIRELESS_MODE} = $wireless_mode{$ethntf->{WIRELESS_MODE}};
+ return "static_hostname";
},
},