summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-20 12:15:02 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-20 12:15:02 +0000
commit8d53eeac658e63e641b53ccffe33bc58ff9af55c (patch)
treec1dbc35dd1cb2fbbd752a417cb1bb66ab09f6d2e /perl-install
parent2faea0682e7dc2dd95b47d65dd7005f8eef88847 (diff)
downloaddrakx-8d53eeac658e63e641b53ccffe33bc58ff9af55c.tar
drakx-8d53eeac658e63e641b53ccffe33bc58ff9af55c.tar.gz
drakx-8d53eeac658e63e641b53ccffe33bc58ff9af55c.tar.bz2
drakx-8d53eeac658e63e641b53ccffe33bc58ff9af55c.tar.xz
drakx-8d53eeac658e63e641b53ccffe33bc58ff9af55c.zip
set connection type at one point only
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/network/netconnect.pm4
1 files changed, 1 insertions, 3 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 838909533..22df45e33 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -220,7 +220,7 @@ If you don't want to use the auto detection, deselect the checkbox.
post => sub {
load_conf($netcnx, $netc, $intf) if $::isInstall; # :-(
get_subwizard($wiz, 'adsl') if $connections{$cnx_type} eq 'adsl';
- return $type = $connections{$cnx_type};
+ return $type = $netcnx->{type} = $connections{$cnx_type};
},
},
@@ -286,7 +286,6 @@ If you don't want to use the auto detection, deselect the checkbox.
[ { val => \$netcnx->{dhcp_client}, list => ["dhcp-client", "dhcpcd", "dhcpxd"] } ],
post => sub {
- $netcnx->{type} = $type = 'cable';
$in->do_pkgs->install($netcnx->{dhcp_client});
write_cnx_script($netc, "cable", qq(
/sbin/ifup $netc->{NET_DEVICE}
@@ -381,7 +380,6 @@ Take a look at http://www.linmodems.org"),
{
pre => sub {
detect($netc->{autodetect}, 'modem') if !$::isInstall;
- $netcnx->{type} = 'modem';
},
name => N("Select the modem to configure:"),
data => sub {