summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-20 10:35:03 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-20 10:35:03 +0000
commit2b8db98d4cfefcd51800ad5172917e89f4fdd174 (patch)
tree3deabbd53ae6304eae1655caa3cb441572095c2a
parent3178ea6a7f0159358b86ce64f6acf58f52277a96 (diff)
downloaddrakx-2b8db98d4cfefcd51800ad5172917e89f4fdd174.tar
drakx-2b8db98d4cfefcd51800ad5172917e89f4fdd174.tar.gz
drakx-2b8db98d4cfefcd51800ad5172917e89f4fdd174.tar.bz2
drakx-2b8db98d4cfefcd51800ad5172917e89f4fdd174.tar.xz
drakx-2b8db98d4cfefcd51800ad5172917e89f4fdd174.zip
merge in next_cnx_step into handle_multiple_cnx
-rw-r--r--perl-install/network/netconnect.pm20
1 files changed, 6 insertions, 14 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index f0d113963..27c3275a1 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -76,7 +76,7 @@ sub detect_timezone() {
my $intf = $o_intf || {};
my $first_time = $o_first_time || 0;
my ($network_configured, $direct_net_install, $cnx_type, $type, $interface, @cards, @all_cards, @devices);
- my (%connection_steps, %connections, %rconnections, @connection_list);
+ my (%connections, %rconnections, @connection_list);
my ($modem, $ntf_name, $ipadr, $netadr, $gateway_ex, $up, $modem, $isdn, $isdn_type, $adsl_type, $need_restart_network);
my ($module, $text, $auto_ip, $net_device, $onboot, $needhostname, $hotplug, $track_network_id, @fields); # lan config
my $success = 1;
@@ -110,22 +110,14 @@ sub detect_timezone() {
my $first_modem = sub { first(grep { $_->{device} =~ m!^/dev! } values %{$netc->{autodetect}{modem}}) };
- my $next_cnx_step = sub {
- my $next = $connection_steps{$cnx_type};
- # FIXME: we want this in standalone mode too:
- $need_restart_network = 1 if $next =~ /lan|cable/;
- if ($next eq "multiple_internet_cnx") {
- return 1 < scalar(keys %{$netc->{internet_cnx}}) ? "multiple_internet_cnx" : $connection_steps{multiple_internet_cnx};
- }
- return $next;
- };
-
my $handle_multiple_cnx = sub {
+ $need_restart_network = 1 if $netcnx->{type} =~ /lan|cable/;
my $nb = keys %{$netc->{internet_cnx}};
if (1 < $nb) {
+ return "multiple_internet_cnx";
} else {
$netc->{internet_cnx_choice} = (keys %{$netc->{internet_cnx}})[0] if $nb == 1;
- return $::isInstall ? "network_on_boot" : "apply_settings"
+ return $::isInstall ? "network_on_boot" : "apply_settings";
}
};
@@ -240,7 +232,7 @@ If you don't want to use the auto detection, deselect the checkbox.
{
name => N("We are now going to configure the %s connection.\n\n\nPress \"%s\" to continue.",
translate($type), N("Next")),
- post => $next_cnx_step,
+ post => $handle_multiple_cnx,
},
@@ -483,7 +475,7 @@ killall pppd
post => sub {
network::modem::ppp_configure($in, $netc, $modem);
$netc->{$_} = 'ppp0' foreach 'NET_DEVICE', 'NET_INTERFACE';
- $next_cnx_step->();
+ $handle_multiple_cnx->();
},
},