From 7eb0e236c248888fcc75d5d9441f040544d7367f Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Tue, 20 Jan 2004 16:13:54 +0000
Subject: share same path in both standalone and in install mode

---
 perl-install/network/netconnect.pm | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 355aa8be4..875a92f23 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -140,33 +140,7 @@ sub get_subwizard {
          defaultimage => "wiz_drakconnect.png",
          name => N("Network & Internet Configuration"),
          pages => {
-                   install => 
-                   {
-                    if_($::isInstall, no_back => 1),
-                    name => N("Welcome to The Network Configuration Wizard.
-
-We are about to configure your internet/network connection.
-If you don't want to use the auto detection, deselect the checkbox.
-"),
-                    interactive_help_id => 'configureNetwork',
-                    data => [
-                             { text => N("Use auto detection"), val => \$netc->{autodetection}, type => 'bool' },
-                             { text => N("Expert Mode"), val => \$::expert, type => 'bool' },
-                            ],
-                    post => sub {
-                        if ($netc->{autodetection}) {
-                            my $_w = $in->wait_message(N("Network Configuration Wizard"), N("Detecting devices..."));
-                            detect($netc->{autodetect});
-                        }
-                        
-                        $conf{$_} = values %{$netc->{autodetect}{$_}} ? 1 : 0 foreach 'lan';
-                        $conf{$_} = $netc->{autodetect}{$_} ? 1 : 0 foreach qw(adsl cable modem winmodem);
-                        $conf{isdn} = any { $_->{driver} } values %{$netc->{autodetect}{isdn}};
-                        return "connection";
-                    },
-                   },
-
-                   connection => 
+                   welcome => 
                    {
                     pre => sub {
                         if (!$::isInstall) {
-- 
cgit v1.2.1