From 2707019e8d43f78fd3913c0ca5f2d79d2fa20cc1 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 10 Jan 2003 13:38:50 +0000
Subject: simplify and factorize (now works on 1.upgrade 2.install 3.install +
 change existing config)

---
 perl-install/install_steps.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index eb51551b2..5d7314166 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -898,9 +898,6 @@ sub setupBootloader {
 sub configureXBefore {
     my ($o) = @_;
 
-    require Xconfig::default;
-    $o->{raw_X} = Xconfig::default::configure($o->{keyboard}, $o->{mouse});
-
     #- keep this here if the package has to be updated.
     $o->pkg_install("XFree86");
 }
@@ -908,6 +905,9 @@ sub configureX {
     my ($o) = @_;
     configureXBefore($o);
 
+    require Xconfig::default;
+    $o->{raw_X} = Xconfig::default::configure($o->{keyboard}, $o->{mouse});
+
     require Xconfig::main;
     Xconfig::main::configure_everything_auto_install($o->{raw_X}, $o->do_pkgs, $o->{X},
 			  { allowFB          => $o->{allowFB},
-- 
cgit v1.2.1