From f0f366d517c87f347f889394416ea21289eec83f Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 9 Feb 2000 21:05:34 +0000
Subject: no_comment

---
 perl-install/install_steps_interactive.pm | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'perl-install/install_steps_interactive.pm')

diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index ddafab251..2cb1e567f 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -348,26 +348,22 @@ sub afterInstallPackages($) {
 sub configureNetwork($) {
     my ($o, $first_time) = @_;
     local $_;
-    if ($o->{intf}) {
-	if (!$::beginner && $first_time || $::expert) {
-	    my @l = (
-		     __("Keep the current IP configuration"),
-		     __("Reconfigure network now"),
-		     __("Do not set up networking"),
-		    );
-	    $_ = $o->ask_from_list_([ _("Network Configuration") ],
-				    _("Local networking has already been configured. Do you want to:"),
-				    [ @l ]) || "Do not";
-	} else { $_ = "Keep"; }
-    } elsif ($o->{modem}) {
-	$_ = "Dialup";
+    if ($o->{intf} && $first_time) {
+	my @l = (
+		 __("Keep the current IP configuration"),
+		 __("Reconfigure network now"),
+		 __("Do not set up networking"),
+		);
+	$_ = $::beginner ? "Keep" : 
+	  $o->ask_from_list_([ _("Network Configuration") ],
+			       _("Local networking has already been configured. Do you want to:"),
+			     [ @l ]) || "Do not";
     } else {
 	$_ = $::beginner ? "Do not" :
 	  $o->ask_from_list_([ _("Network Configuration") ],
 			     _("Do you want to configure networking for your system?"),
 			     [ __("Local LAN"), __("Dialup with modem"), __("Do not set up networking") ]);
     }
-
     if (/^Dialup/) {
 	$o->pppConfig;
     } elsif (/^Do not/) {
-- 
cgit v1.2.1