From 7c1a8317be263c7171da27f07dca2a56480e00e2 Mon Sep 17 00:00:00 2001
From: damien <damien@mandriva.com>
Date: Tue, 31 Jul 2001 00:25:32 +0000
Subject: added intro step for each configuration type.

---
 perl-install/network/ethernet.pm   |  4 ++--
 perl-install/network/netconnect.pm | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'perl-install/network')

diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 9776924e6..4edb584b6 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -75,8 +75,7 @@ sub configure_lan {
 	$netcnx->{type}='lan';
 	$netcnx->{NET_DEVICE} = $netc->{NET_DEVICE} = '';
 	$netcnx->{NET_INTERFACE} = 'lan'; #$netc->{NET_INTERFACE};
-    }
-    write_cnx_script($netc, "local network",
+        write_cnx_script($netc, "local network",
 qq(
 #!/bin/bash
 /etc/rc.d/init.d/network restart
@@ -86,6 +85,7 @@ qq(
 /etc/rc.d/init.d/network stop
 /sbin/ifup lo
 ));
+    }
     $::isStandalone and modules::write_conf($prefix);
     1;
 }
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index bb136e64b..4a4e7dbad 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -169,11 +169,17 @@ ifdown eth0
 
 #    load_conf ($netcnx, $netc, $intf);
 
-    $conf{modem} and do { require network::modem; network::modem::configure($netcnx, $mouse, $netc) or goto step_2 };
-    $conf{isdn} and do { require network::isdn; network::isdn::configure($netcnx, $netc) or goto step_2 };
-    $conf{adsl} and do { require network::adsl; network::adsl::configure($netcnx, $netc, $intf, $first_time) or goto step_2 };
-    $conf{cable} and do { require network::ethernet; network::ethernet::configure_cable($netcnx, $netc, $intf, $first_time) or goto step_2 };
-    $conf{lan} and do { require network::ethernet; network::ethernet::configure_lan($netcnx, $netc, $intf, $first_time) or goto step_2 };
+    my $pre_func = sub {
+	$::Wizard_no_previous=1;
+	#$_[0] is the type of connection of the list: (modem, isdn, adsl, cable, local network);
+	$in->ask_okcancel(_("Network Configuration"), _("\n\n\nWe are now going to configure the %s connection.\n\n\nPress next to begin.",_($_[0])), 1);
+	undef $::Wizard_no_previous;
+    };
+    $conf{modem} and do { &$pre_func("modem"); require network::modem; network::modem::configure($netcnx, $mouse, $netc) or goto step_2 };
+    $conf{isdn} and do { &$pre_func("isdn"); require network::isdn; network::isdn::configure($netcnx, $netc) or goto step_2 };
+    $conf{adsl} and do { &$pre_func("adsl"); require network::adsl; network::adsl::configure($netcnx, $netc, $intf, $first_time) or goto step_2};
+    $conf{cable} and do { &$pre_func("cable"); require network::ethernet; network::ethernet::configure_cable($netcnx, $netc, $intf, $first_time) or goto step_2 };
+    $conf{lan} and do { &$pre_func("local network"); require network::ethernet; network::ethernet::configure_lan($netcnx, $netc, $intf, $first_time) or goto step_2 };
 
   step_2_1:
     my $nb = keys %{$netc->{internet_cnx}};
@@ -190,7 +196,7 @@ ifdown eth0
     }
     $netc->{internet_cnx_choice} and write_cnx_script($netc);
 
-    $::isStandalone and ask_connect_now() or goto step_2_1;
+    $::isStandalone and ask_connect_now();
 
   step_3:
 
-- 
cgit v1.2.1