summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-20 10:36:47 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-20 10:36:47 +0000
commitfd3245f9dd3884d4b14cf0c8e2cd4ee57152aae2 (patch)
treef42218f95a6910b8e1645a5bbafcec56f90b58bf
parent2b8db98d4cfefcd51800ad5172917e89f4fdd174 (diff)
downloaddrakx-fd3245f9dd3884d4b14cf0c8e2cd4ee57152aae2.tar
drakx-fd3245f9dd3884d4b14cf0c8e2cd4ee57152aae2.tar.gz
drakx-fd3245f9dd3884d4b14cf0c8e2cd4ee57152aae2.tar.bz2
drakx-fd3245f9dd3884d4b14cf0c8e2cd4ee57152aae2.tar.xz
drakx-fd3245f9dd3884d4b14cf0c8e2cd4ee57152aae2.zip
prepare killing obfuscated install path
-rw-r--r--perl-install/network/netconnect.pm21
1 files changed, 2 insertions, 19 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 27c3275a1..92cec2997 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -185,7 +185,7 @@ If you don't want to use the auto detection, deselect the checkbox.
+{ text => $rconnections{$type}, val => \$conf{$type}, type => 'bool' }
} @connections;
} else {
- @connection_list = ({ val => \$type, type => 'list', list => [ map { $_->[0] } @connections ], });
+ @connection_list = ({ val => \$cnx_type, type => 'list', list => [ map { $_->[0] } @connections ], });
}
},
if_(!$::isInstall, no_back => 1),
@@ -207,24 +207,7 @@ If you don't want to use the auto detection, deselect the checkbox.
},
post => sub {
load_conf($netcnx, $netc, $intf) if $::isInstall; # :-(
- # while in installer, we need to link connections steps depending of which connections the user selected
- my @l;
- if ($::isInstall) {
- @l = grep { $conf{$_} } keys %conf;
- } else {
- $type = $connections{$type};
- @l = ($type);
- }
- my $first = shift @l;
- my @steps = (@l, "multiple_internet_cnx", "apply_settings");
- foreach my $cnx ($first, @l) {
- $connection_steps{$cnx} = shift @steps;
- }
- #
- # FIXME: get rid of all bugs by just sharing the same paths between standalone and install mode (anyway
- # old "all cnx in one pass" was not very wizard-friendly....
- #
- return $type;
+ return $type = $connections{$cnx_type};
},
},