diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-16 23:05:42 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-16 23:05:42 +0000 |
| commit | 815bbee4072296ec88838db653ed443df1ce8d07 (patch) | |
| tree | 84bdcdf696d4839304fac3f02c53118a4b9a86e3 /perl-install/network/netconnect.pm | |
| parent | 29d030f53ece64b8be66c102f2b359b57136a611 (diff) | |
| download | drakx-815bbee4072296ec88838db653ed443df1ce8d07.tar drakx-815bbee4072296ec88838db653ed443df1ce8d07.tar.gz drakx-815bbee4072296ec88838db653ed443df1ce8d07.tar.bz2 drakx-815bbee4072296ec88838db653ed443df1ce8d07.tar.xz drakx-815bbee4072296ec88838db653ed443df1ce8d07.zip | |
rollback "separate standalone and install paths" try (just too painful to
maintain and anyway install net wizard has no logic)
Diffstat (limited to 'perl-install/network/netconnect.pm')
| -rw-r--r-- | perl-install/network/netconnect.pm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index fe0fde4f8..9cf20f6de 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -229,14 +229,15 @@ If you don't want to use the auto detection, deselect the checkbox. @l = ($type); } my $first = shift @l; - my @steps = (@l, - "multiple_internet_cnx", - ($::isInstall ? "miscellaneous_choose" : "apply_settings")); + my @steps = (@l, "multiple_internet_cnx", "apply_settings"); foreach my $cnx ($first, @l) { $connection_steps{$cnx} = shift @steps; } - # FIXME: s/$type/"${type}_standalone"/ (because of newer steps for standalone mode just break all but lan paths: - return $::isInstall ? "prepare_detection" : "${type}_standalone"; + # + # 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; }, }, |