summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-05-08 21:23:48 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-05-08 21:23:48 +0000
commit232c321f81d0a1b6e9942406c89c7bfcef572621 (patch)
treeb567bfca0753f7d170c285db4d57d85780aaa0b0 /perl-install
parent55003f1472479cebdc92a83e96fb060bd6239194 (diff)
downloaddrakx-232c321f81d0a1b6e9942406c89c7bfcef572621.tar
drakx-232c321f81d0a1b6e9942406c89c7bfcef572621.tar.gz
drakx-232c321f81d0a1b6e9942406c89c7bfcef572621.tar.bz2
drakx-232c321f81d0a1b6e9942406c89c7bfcef572621.tar.xz
drakx-232c321f81d0a1b6e9942406c89c7bfcef572621.zip
no_comment
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/Xconfig.pm3
-rw-r--r--perl-install/Xconfigurator.pm1
-rwxr-xr-xperl-install/standalone/XFdrake4
3 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/Xconfig.pm b/perl-install/Xconfig.pm
index 925c836e0..7be6f72b2 100644
--- a/perl-install/Xconfig.pm
+++ b/perl-install/Xconfig.pm
@@ -119,6 +119,9 @@ 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 0d46c73db..56fcb505f 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -128,6 +128,7 @@ 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 1f3249efd..a41932fea 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