summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-11-21 17:25:55 +0000
committerFrancois Pons <fpons@mandriva.com>2000-11-21 17:25:55 +0000
commit3d02606d2b0d1c3426759b68c6a6d9c2a2333b85 (patch)
treec67665506dbebc8efeb2100475cb31fdf21d5ba8 /perl-install
parentd68f8a85300b159267e6d76bd6211c61bed8efb0 (diff)
downloaddrakx-3d02606d2b0d1c3426759b68c6a6d9c2a2333b85.tar
drakx-3d02606d2b0d1c3426759b68c6a6d9c2a2333b85.tar.gz
drakx-3d02606d2b0d1c3426759b68c6a6d9c2a2333b85.tar.bz2
drakx-3d02606d2b0d1c3426759b68c6a6d9c2a2333b85.tar.xz
drakx-3d02606d2b0d1c3426759b68c6a6d9c2a2333b85.zip
removed code to ask if take care of /etc/X11/XF86Config* files.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_steps_interactive.pm10
1 files changed, 1 insertions, 9 deletions
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;