From 3d02606d2b0d1c3426759b68c6a6d9c2a2333b85 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Tue, 21 Nov 2000 17:25:55 +0000
Subject: removed code to ask if take care of /etc/X11/XF86Config* files.

---
 perl-install/install_steps_interactive.pm | 10 +---------
 1 file changed, 1 insertion(+), 9 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 3f8bc2a1e..2d9e48083 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1002,21 +1002,13 @@ sub configureX {
     my ($o, $clicked) = @_;
     $o->configureXBefore;
 
-    require Xconfig;
-    require Xconfigurator;
-    #- by default do not use existing configuration, so new card will be detected.
-    if ($o->{isUpgrade} && -r "$o->{prefix}/etc/X11/XF86Config") {
-	if ($::beginner || $o->ask_yesorno('', _("Use existing configuration for X11?"), 1)) {
-	    Xconfig::getinfoFromXF86Config($o->{X}, $o->{prefix});
-	}
-    }
-
     #- strange, xfs must not be started twice...
     #- trying to stop and restart it does nothing good too...
     my $xfs_started if 0;
     run_program::rooted($o->{prefix}, "/etc/rc.d/init.d/xfs", "start") unless $::live || $xfs_started;
     $xfs_started = 1;
 
+    require Xconfigurator;
     { local $::testing = 0; #- unset testing
       local $::auto = $::beginner && !$clicked;
 
-- 
cgit v1.2.1