From 1407fc9541882801dec8d4a38de68688b33bb31a Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 8 May 2000 21:31:56 +0000
Subject: no_comment

---
 perl-install/Xconfig.pm         | 3 ---
 perl-install/Xconfigurator.pm   | 1 -
 perl-install/standalone/XFdrake | 4 ++--
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/perl-install/Xconfig.pm b/perl-install/Xconfig.pm
index 7be6f72b2..925c836e0 100644
--- a/perl-install/Xconfig.pm
+++ b/perl-install/Xconfig.pm
@@ -119,9 +119,6 @@ sub getinfoFromDDC {
     my ($m, @l) = `ddcxinfos`;
     $? == 0 or return $o;
 
-    $O->{size} = 14;
-    $o->{card}{memory} = 1 * 1024;
-
     $o->{card}{memory} ||= to_int($m);
     local $_;
     while (($_ = shift @l) ne "\n") {
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 56fcb505f..0d46c73db 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -128,7 +128,6 @@ sub rewriteInittab {
 sub keepOnlyLegalModes {
     my ($card, $monitor) = @_;
     my $mem = 1024 * ($card->{memory} || ($card->{server} eq 'FBDev' ? 2048 : 99999));
-    print "$mem<<<\n";
     my $hsync = max(split(/[,-]/, $monitor->{hsyncrange}));
 
     while (my ($depth, $res) = each %{$card->{depth}}) {
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index a41932fea..1f3249efd 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -17,7 +17,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-use lib qw(.); #/usr/lib/libDrakX);
+use lib qw(/usr/lib/libDrakX);
 
 use interactive;
 use Xconfigurator;
@@ -43,7 +43,7 @@ my $f = "/usr/X11R6/lib/X11/Cards";
 
 my $in = vnew interactive('su');
 
-#`pidof xfs` > 0 or system("/etc/rc.d/init.d/xfs start");
+`pidof xfs` > 0 or system("/etc/rc.d/init.d/xfs start");
 
 system("mount /proc 2>/dev/null"); # ensure /proc is mounted for pci probing
 
-- 
cgit v1.2.1