From e2d5910163e6a0c415ea08a3b4dc7a047803d963 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Sat, 6 Nov 1999 15:10:34 +0000
Subject: *** empty log message ***

---
 perl-install/Xconfigurator.pm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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

diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 176d0a430..c3214b184 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -270,6 +270,8 @@ sub testFinalConfig($;$) {
     #- create a link from the non-prefixed /tmp/.X11-unix/X9 to the prefixed one
     #- that way, you can talk to :9 without doing a chroot
     symlinkf "$prefix/tmp/.X11-unix/X9", "/tmp/.X11-unix/X9" if $prefix;
+    run_program::rooted($o->{prefix}, "/etc/rc.d/init.d/xfs", "stop");
+    run_program::rooted($o->{prefix}, "/etc/rc.d/init.d/xfs", "start");
 
     my $f_err = "$prefix/tmp/Xoutput";
     my $pid;
@@ -366,9 +368,9 @@ sub autoDefaultDepth($$) {
     my ($card, $wres_wanted) = @_;
     my ($best, $depth);
 
-    if ($card->{server} eq 'FBDev') {
-	16; #- assume 16 bits depth for this case.
-    } else {
+#    if ($card->{server} eq 'FBDev') {
+#	16; #- assume 16 bits depth for this case.
+#    } else {
 	while (my ($d, $r) = each %{$card->{depth}}) {
 	    $depth = $depth ? max($depth, $d) : $d;
 
@@ -376,7 +378,7 @@ sub autoDefaultDepth($$) {
 	    $best = $best ? max($best, $d) : $d if $r->[0][0] >= $wres_wanted;
 	}
 	$best || $depth or die "no valid modes";
-    }
+#    }
 }
 
 sub autoDefaultResolution(;$) {
-- 
cgit v1.2.1